Merge remote branch 'origin/master'

This commit is contained in:
ninadsp
2010-06-15 15:39:51 +05:30
70 changed files with 1748 additions and 2132 deletions

View File

@@ -447,6 +447,15 @@ if (isset($my_die)) {
}
}
// we want to see the results of the last query that returned at least a row
if (! empty($last_query_with_results)) {
// but we want to show intermediate results too
$disp_query = $sql_query;
$disp_message = __('Your SQL query has been executed successfully');
$sql_query = $last_query_with_results;
$go_sql = true;
}
if ($go_sql) {
require './sql.php';
} else {