diff options
| -rwxr-xr-x | ChangeLog | 2 | ||||
| -rw-r--r-- | browse_foreigners.php | 1 | ||||
| -rw-r--r-- | left.php | 3 | ||||
| -rw-r--r-- | libraries/header_meta_style.inc.php | 5 |
4 files changed, 3 insertions, 8 deletions
@@ -9,6 +9,8 @@ $Source$ * scripts/create-release.sh, scripts/upgrade.pl: Use same URL for updating as for setup.php, this one is autogenerated so there is no need for more manual steps. + * browse_foreigners.php, left.php, libraries/header_meta_style.inc.php: + Drop <base href=".." />, it should not be needed at all. 2005-12-11 Sebastian Mendel <cybot_tm@users.sourceforge.net> * libraries/database_interface.lib.php::PMA_DBI_get_columns_full(): diff --git a/browse_foreigners.php b/browse_foreigners.php index 75cb5ba1ad..a03e8e67e9 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -92,7 +92,6 @@ if (isset($disp_row) && is_array($disp_row)) { <head> <title>phpMyAdmin</title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> - <base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> /> <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&js_frame=right" /> <script src="./js/functions.js" type="text/javascript" language="javascript"></script> @@ -73,8 +73,7 @@ echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">"; <title>phpMyAdmin</title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> - <base href="<?php echo $GLOBALS['cfg']['PmaAbsoluteUri']; ?>" - target="frame_content" /> + <base target="frame_content" /> <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&js_frame=left" /> <script type="text/javascript" language="javascript"> diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 1b8859ff7b..a104a5998a 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -34,10 +34,5 @@ echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">"; echo 'phpMyAdmin'; ?></title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> -<?php -if (!empty($GLOBALS['cfg']['PmaAbsoluteUri'])) { - echo '<base href="' . $GLOBALS['cfg']['PmaAbsoluteUri'] . '" />' . "\n"; -} -?> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/print.css?<?php echo PMA_generate_common_url(); ?>" media="print" /> |