The branch, master has been updated via 701268fb5778e4031c6b79d910c068f05c14c79e (commit) via b2fa59876b335facc96464a357f5b234494d8fe5 (commit) from 39bc66df25b98aa61caba73b36003fe763346703 (commit)
- Log ----------------------------------------------------------------- commit 701268fb5778e4031c6b79d910c068f05c14c79e Author: Michal Čihař mcihar@novell.com Date: Fri Jan 28 10:29:47 2011 +0100
No javascript footer in AJAX requests.
commit b2fa59876b335facc96464a357f5b234494d8fe5 Author: Michal Čihař mcihar@novell.com Date: Fri Jan 28 10:24:34 2011 +0100
Avoid showing open in new window for AJAX requests.
-----------------------------------------------------------------------
Summary of changes: libraries/footer.inc.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index f5e6e98..f6222f8 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -88,6 +88,7 @@ if (! empty($_SESSION['debug'])) { $_SESSION['debug'] = array(); }
+if (!$GLOBALS['is_ajax_request']) { ?> <script type="text/javascript"> //<![CDATA[ @@ -162,13 +163,14 @@ if (window.parent.frame_content) { //]]> </script> <?php +}
// Link to itself to replicate windows including frameset if (!isset($GLOBALS['checked_special'])) { $GLOBALS['checked_special'] = false; }
-if (PMA_getenv('SCRIPT_NAME') && empty($_POST) && !$GLOBALS['checked_special']) { +if (PMA_getenv('SCRIPT_NAME') && empty($_POST) && !$GLOBALS['checked_special'] && ! $GLOBALS['is_ajax_request']) { echo '<div id="selflink" class="print_ignore">' . "\n"; $url_params['target'] = basename(PMA_getenv('SCRIPT_NAME')); ?>
hooks/post-receive