[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-268-g8d862a8

Marc Delisle lem9 at users.sourceforge.net
Sun May 1 12:50:47 CEST 2011


The branch, master has been updated
       via  8d862a8cb5c9b8dc37ae1aea10205eec35e68ae8 (commit)
      from  626477ac8f1db0129f009f2e3076d71f053f81a0 (commit)


- Log -----------------------------------------------------------------
commit 8d862a8cb5c9b8dc37ae1aea10205eec35e68ae8
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun May 1 06:50:37 2011 -0400

    Bug #3294818 Fatal error in server_privileges.php (bot access)

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

Summary of changes:
 server_privileges.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 308739c..a9ebcd9 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1451,7 +1451,9 @@ if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && (!isset($_REQU
         $extra_data['new_privileges'] = $new_privileges;
     }
 
-    PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+    if ($message instanceof PMA_Message) {
+        PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+    }
 }
 
 /**


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list