nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop <base href=".." />, it should not be needed at all.

Browse Source
This commit is contained in:
Michal Čihař
2005-12-11 20:20:14 +00:00
parent 0ff32f1157
commit 8cdb8fb2aa
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -9,6 +9,8 @@ $Source$
* scripts/create-release.sh, scripts/upgrade.pl: Use same URL for updating * 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 as for setup.php, this one is autogenerated so there is no need for more
manual steps. 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> 2005-12-11 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/database_interface.lib.php::PMA_DBI_get_columns_full(): * libraries/database_interface.lib.php::PMA_DBI_get_columns_full():

1
browse_foreigners.php
View File

@@ -92,7 +92,6 @@ if (isset($disp_row) && is_array($disp_row)) {
<head> <head>
<title>phpMyAdmin</title> <title>phpMyAdmin</title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> <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" <link rel="stylesheet" type="text/css"
href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=right" /> href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=right" />
<script src="./js/functions.js" type="text/javascript" language="javascript"></script> <script src="./js/functions.js" type="text/javascript" language="javascript"></script>

3
left.php
View File

@@ -73,8 +73,7 @@ echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">";
<title>phpMyAdmin</title> <title>phpMyAdmin</title>
<meta http-equiv="Content-Type" <meta http-equiv="Content-Type"
content="text/html; charset=<?php echo $charset; ?>" /> content="text/html; charset=<?php echo $charset; ?>" />
<base href="<?php echo $GLOBALS['cfg']['PmaAbsoluteUri']; ?>" <base target="frame_content" />
target="frame_content" />
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=left" /> href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=left" />
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">

5
libraries/header_meta_style.inc.php
View File

@@ -34,10 +34,5 @@ echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">";
echo 'phpMyAdmin'; echo 'phpMyAdmin';
?></title> ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> <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(); ?>&amp;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/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;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" /> <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" />