From 06d6b87e5b68a9d2a1171a79acc57784b062223e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 May 2011 06:31:15 -0400 Subject: [PATCH] This message was never displayed --- db_qbe.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index 6720495654..751317d111 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -18,25 +18,29 @@ $cfgRelation = PMA_getRelationsParam(); /** - * A query has been submitted -> execute it, else display the headers + * A query has been submitted -> (maybe) execute it */ +$message_to_display = false; if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) { - $goto = 'db_sql.php'; - require './sql.php'; - exit; -} else { - $sub_part = '_qbe'; - require './libraries/db_common.inc.php'; - $url_query .= '&goto=db_qbe.php'; - $url_params['goto'] = 'db_qbe.php'; - require './libraries/db_info.inc.php'; + if (! preg_match('@^SELECT@i', $sql_query)) { + $message_to_display = true; + } else { + $goto = 'db_sql.php'; + require './sql.php'; + exit; + } } -if (isset($_REQUEST['submit_sql']) - && ! preg_match('@^SELECT@i', $sql_query)) { +$sub_part = '_qbe'; +require './libraries/db_common.inc.php'; +$url_query .= '&goto=db_qbe.php'; +$url_params['goto'] = 'db_qbe.php'; +require './libraries/db_info.inc.php'; + +if ($message_to_display) { PMA_Message::error(__('You have to choose at least one column to display'))->display(); } - +unset($message_to_display); /** * Initialize some variables -- 2.11.4.GIT