Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #3902: Cannot browse when table name contains keyword 'call' #375

Merged
merged 1 commit into from May 14, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion sql.php
Expand Up @@ -646,7 +646,13 @@
} 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;
}

Expand Down