Merge pull request #375 from Chanaka/QA_4_0
Fixed #3902: Cannot browse when table name contains keyword 'call'
This commit is contained in:
commit
f8e90174a0
@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
|
||||
======================
|
||||
|
||||
4.0.2.0 (not yet released)
|
||||
- bug #3902 Cannot browse when table name contains keyword "call"
|
||||
+ center loading indicator for navigation refresh, related to bug #3920
|
||||
- bug #3925 Table sorting in navigation panel is case-sensitive
|
||||
- bug #3915 Import of CSV file (Replace table data with file) with duplicate
|
||||
|
||||
8
sql.php
8
sql.php
@ -646,7 +646,13 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
|
||||
} while (PMA_DBI_next_result());
|
||||
|
||||
$is_procedure = false;
|
||||
if (stripos($full_sql_query, 'call') !== false) {
|
||||
|
||||
// Since multpile query execution is anyway handled,
|
||||
// ignore the where clause of the first sql statement
|
||||
// which might contain a phrase like 'call '
|
||||
if (preg_match("/\bcall\b/i", $full_sql_query)
|
||||
&& empty($analyzed_sql[0]['where_clause'])
|
||||
) {
|
||||
$is_procedure = true;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user