Fixed conflict due to upstream merge
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -22,25 +21,7 @@ if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
|
||||
<?php
|
||||
}
|
||||
// generate title
|
||||
$title = str_replace(
|
||||
array(
|
||||
'@HTTP_HOST@',
|
||||
'@SERVER@',
|
||||
'@VERBOSE@',
|
||||
'@VSERVER@',
|
||||
'@DATABASE@',
|
||||
'@TABLE@',
|
||||
'@PHPMYADMIN@',
|
||||
),
|
||||
array(
|
||||
PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '',
|
||||
isset($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['Server']['host'] : '',
|
||||
isset($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : '',
|
||||
!empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : (isset($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['Server']['host'] : ''),
|
||||
$GLOBALS['db'],
|
||||
$GLOBALS['table'],
|
||||
'phpMyAdmin ' . PMA_VERSION,
|
||||
),
|
||||
$title = PMA_expandUserString(
|
||||
!empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] :
|
||||
(!empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] :
|
||||
(!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] :
|
||||
|
Reference in New Issue
Block a user