[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5817-gf5aa40b

[Michal Čihař]

The branch, master has been updated
       via  f5aa40b02f3cb363256f2983a092ede845c305de (commit)
      from  ec18488499312fb3d4a3678f52c8aed77a35662c (commit)


- Log -----------------------------------------------------------------
commit f5aa40b02f3cb363256f2983a092ede845c305de
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Jul 21 13:32:26 2010 +0200

    Catch error when connection to validator service fails.

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

Summary of changes:
 libraries/common.lib.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index a8c32fc..61bb709 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1130,7 +1130,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         if (! empty($GLOBALS['show_as_php'])) {
             $query_base = '$sql  = "' . $query_base;
         } elseif (! empty($GLOBALS['validatequery'])) {
-            $query_base = PMA_validateSQL($query_base);
+            try {
+                $query_base = PMA_validateSQL($query_base);
+            } catch (Exception $e) {
+                PMA_Message::error(__('Failed to connect to SQL validator!'))->display();
+            }
         } elseif (isset($parsed_sql)) {
             $query_base = PMA_formatSql($parsed_sql, $query_base);
         }


hooks/post-receive
-- 
phpMyAdmin