diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | browse_foreigners.php | 2 | ||||
-rw-r--r-- | libraries/Config.class.php | 4 | ||||
-rw-r--r-- | libraries/Theme.class.php | 18 | ||||
-rw-r--r-- | libraries/header_meta_style.inc.php | 2 | ||||
-rw-r--r-- | libraries/header_printview.inc.php | 2 | ||||
-rw-r--r-- | navigation.php | 2 |
7 files changed, 21 insertions, 10 deletions
@@ -27,6 +27,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #1814679 [display] Database selection pagination when switching servers - patch #1861717 [export] CSV Escape character not exported right, thanks to nicolasdigraf +- bug #1864468 [display] Theme does not switch to darkblue_orange 2.11.3.0 (2007-12-08) - patch #1818389 to remove a notice (failed to flush buffer), thanks to diff --git a/browse_foreigners.php b/browse_foreigners.php index 9cd365fcf8..4010dda575 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -95,7 +95,7 @@ if (isset($disp_row) && is_array($disp_row)) { <title>phpMyAdmin</title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> <link rel="stylesheet" type="text/css" - href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=right&nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" /> + href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=right&nocache=<?php echo $_SESSION['PMA_Config']->getThemeUniqueValue(); ?>" /> <script src="./js/functions.js" type="text/javascript"></script> <script type="text/javascript"> //<![CDATA[ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 42284a4917..d0d170829b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -542,9 +542,9 @@ class PMA_Config * or the theme changes * @return int Unix timestamp */ - function getMtime() + function getThemeUniqueValue() { - return intval($_SESSION['PMA_Config']->get('fontsize')) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info); + return intval($_SESSION['PMA_Config']->get('fontsize')) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info); } /** diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index a0a93eb9b8..2e204f198b 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -9,9 +9,9 @@ /** * handles theme * - * @todo add the possibility to make a theme depends on another theme and by default on orignal - * @todo make all components optional - taking missing compnents from 'parent' theme - * @todo make css optionaly replacing 'parent' css or extending it (by appending at the end) + * @todo add the possibility to make a theme depends on another theme and by default on original + * @todo make all components optional - taking missing components from 'parent' theme + * @todo make css optionally replacing 'parent' css or extending it (by appending at the end) * @todo add an optional global css file - which will be used for both frames * */ @@ -59,12 +59,21 @@ class PMA_Theme { var $mtime_info = 0; /** + * needed because sometimes, the mtime for different themes + * is identical + * @var integer filesize for info file + * @access protected + */ + var $filesize_info = 0; + + /** * @access public * @uses PMA_Theme::getPath() * @uses PMA_Theme::$mtime_info * @uses PMA_Theme::setVersion() * @uses PMA_Theme::setName() * @uses filemtime() + * @uses filesize() * @uses file_exists() * @return boolean whether loading them info was successful or not */ @@ -86,6 +95,7 @@ class PMA_Theme { } $this->mtime_info = filemtime($this->getPath() . '/info.inc.php'); + $this->filesize_info = filesize($this->getPath() . '/info.inc.php'); if (isset($theme_full_version)) { $this->setVersion($theme_full_version); @@ -382,4 +392,4 @@ class PMA_Theme { .'</div>'; } } -?>
\ No newline at end of file +?> diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index daf29624a8..12cc1313dd 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -42,5 +42,5 @@ if ($GLOBALS['text_dir'] == 'ltr') { } ?></title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> - <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $_SESSION['PMA_Config']->getThemeUniqueValue(); ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" /> diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index f3530ee32b..73724ffcfe 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -44,7 +44,7 @@ if ($text_dir == 'ltr') { <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> -<link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=print&nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" /> +<link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=print&nocache=<?php echo $_SESSION['PMA_Config']->getThemeUniqueValue(); ?>" /> </style> </head> diff --git a/navigation.php b/navigation.php index 9146bf10e0..ad076d0c72 100644 --- a/navigation.php +++ b/navigation.php @@ -141,7 +141,7 @@ $pos = $_SESSION['userconf']['navi_limit_offset']; content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> <base target="frame_content" /> <link rel="stylesheet" type="text/css" - href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" /> + href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $_SESSION['PMA_Config']->getThemeUniqueValue(); ?>" /> <script type="text/javascript" src="js/navigation.js"></script> <script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript"> |