[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-21-g158ce06

Marc Delisle lem9 at users.sourceforge.net
Sat Sep 24 12:19:08 CEST 2011


The branch, QA_3_4 has been updated
       via  158ce0657a8e9779348bbde43332b6a07ee37886 (commit)
      from  5b2befc1716bfca6b21305a0cb5df6d965eb4c9a (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 libraries/header_scripts.inc.php |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index c25aa99..a65445b 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -20,12 +20,14 @@ if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
 }
 // generate title (unless we already have $page_title, from cookie auth)
 if (! isset($page_title)) {
-    $title = PMA_expandUserString(
-            !empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] :
-            (!empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] :
-            (!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] :
+    if ($GLOBALS['server'] > 0) {
+        $title = PMA_expandUserString(
+            ! empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] :
+            (! empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] :
+            (! empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] :
             $GLOBALS['cfg']['TitleDefault']))
         );
+    }
 } else {
     $title = $page_title;
 }
@@ -57,7 +59,7 @@ foreach ($GLOBALS['js_include'] as $js_script_file) {
 // Updates the title of the frameset if possible (ns4 does not allow this)
 if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
     && typeof(parent.document.title) == 'string') {
-    parent.document.title = '<?php echo PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))); ?>';
+    parent.document.title = '<?php echo (isset($title) ? PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))) : ''); ?>';
 }
 
 <?php


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list