[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9291-g0c7e5b3

[Michal Čihař]

The branch, master has been updated
       via  0c7e5b3f758607f43ab563738559bc2cd96b5641 (commit)
      from  b122e4527af1666a24969950c5053d0e8b3ac868 (commit)


- Log -----------------------------------------------------------------
commit 0c7e5b3f758607f43ab563738559bc2cd96b5641
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Aug 30 10:47:26 2010 +0200

    [bug #3055899] No footer file in ajax request.

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

Summary of changes:
 libraries/footer.inc.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 781154d..7e01216 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -206,7 +206,7 @@ setURLHash("<?php echo PMA_generate_common_url($url_params, 'text', ''); ?>");
 }
 
 // Include possible custom footers
-if (file_exists(CUSTOM_FOOTER_FILE)) {
+if (! $GLOBALS['is_ajax_request'] && file_exists(CUSTOM_FOOTER_FILE)) {
     require CUSTOM_FOOTER_FILE;
 }
 


hooks/post-receive
-- 
phpMyAdmin