[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-793-g06d6b87

[Marc Delisle]

The branch, master has been updated
       via  06d6b87e5b68a9d2a1171a79acc57784b062223e (commit)
       via  69646655d3f843be3c4842860e3b6a5a325edff9 (commit)
      from  5452b51ee9dfedfa37517bdcaf4b894586135a4c (commit)


- Log -----------------------------------------------------------------
commit 06d6b87e5b68a9d2a1171a79acc57784b062223e
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu May 5 06:31:15 2011 -0400

    This message was never displayed

commit 69646655d3f843be3c4842860e3b6a5a325edff9
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu May 5 06:21:47 2011 -0400

    This message is not needed (and does not work anyway)

-----------------------------------------------------------------------

Summary of changes:
 db_qbe.php |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/db_qbe.php b/db_qbe.php
index 2319b82..751317d 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -18,26 +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';
-    $message_to_show = htmlspecialchars(__('Your SQL query has been executed successfully'));
-    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 at i', $sql_query)) {
+        $message_to_display = true;
+    } else {
+        $goto      = 'db_sql.php';
+        require './sql.php';
+        exit;
+    }
 }
 
-if (isset($_REQUEST['submit_sql'])
- && ! preg_match('@^SELECT at 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


hooks/post-receive
-- 
phpMyAdmin