From 3caafb302d66af8854c2bd6227f0cff35b2278cd Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Sun, 12 May 2013 22:54:23 +0530 Subject: [PATCH] Fixed #3902: Cannot browse when table name contains keyword 'call' --- ChangeLog | 1 + sql.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0d5123cb2b..a93fdf1720 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/sql.php b/sql.php index 0fdde041a4..1a4f089fd3 100644 --- a/sql.php +++ b/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; }