gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #177 from hisamith/limit_error_3833

Browse Source 
Fixed #3833 Undefined variable: sql_limit_to_append.
This commit is contained in:
Dieter Adriaenssens 2013-02-21 08:49:15 -08:00
commit dde56a3966
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/Util.class.php
View File

@ -1145,7 +1145,7 @@ class PMA_Util
*/
if (isset($analyzed_display_query[0]['queryflags']['select_from'])
&& isset($GLOBALS['sql_limit_to_append'])
&& ! empty($GLOBALS['sql_limit_to_append'])
) {
$query_base = $analyzed_display_query[0]['section_before_limit']
. "\n" . $GLOBALS['sql_limit_to_append']

1
sql.php
View File

@ -560,6 +560,7 @@ if ($GLOBALS['cfg']['RememberSorting']
PMA_handleSortOrder($db, $table, $analyzed_sql, $full_sql_query);
}
$sql_limit_to_append = '';
// Do append a "LIMIT" clause?
if (($_SESSION['tmp_user_values']['max_rows'] != 'all')
&& ! ($is_count || $is_export || $is_func || $is_analyse)