The branch, master has been updated
via 480e77e77e6a8f437ee50fa4c0603b494fe6407b (commit)
via 158ce0657a8e9779348bbde43332b6a07ee37886 (commit)
from efa9eeb5583d95972af3fe195e903ac843103de8 (commit)
- Log -----------------------------------------------------------------
commit 480e77e77e6a8f437ee50fa4c0603b494fe6407b
Merge: efa9eeb 158ce06
Author: Marc Delisle <[email protected]>
Date: Sat Sep 24 06:18:00 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
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 21c5d9a..d211e48 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) {
// <![CDATA[
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
if(count($GLOBALS['js_script']) > 0) {
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
