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

Font size option problem when no config file

Browse Source
This commit is contained in:
Marc Delisle
2008-06-28 15:46:54 +00:00
parent 96adecc19b
commit 1c96d44d34
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -76,6 +76,8 @@ danbarry
- bug #1989281 [export] Export fails if one table is marked as crashed
- bug #2001005 [GUI] ARCHIVE cannot have indexes
- bug #1989281 [export] CSV for MS Excel incorrect escaping of double quotes
- bug #1959855 [interface] Font size option problem when no config file
(todo (trunk): navi frame size does not change for theme original)
2.11.7.0 (2008-06-23)
- bug #1908719 [interface] New field cannot be auto-increment and primary key

12
libraries/Config.class.php
View File

@@ -535,11 +535,13 @@ class PMA_Config
/**
* returns a unique value to force a CSS reload if either the config
* or the theme changes
* must also check the pma_fontsize cookie in case there is no
* config file
* @return int Unix timestamp
*/
function getThemeUniqueValue()
{
return intval($_SESSION['PMA_Config']->get('fontsize')) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info);
return intval((null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize'])) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info);
}
/**
@@ -1005,6 +1007,14 @@ class PMA_Config
static protected function _getFontsizeSelection()
{
$current_size = $_SESSION['PMA_Config']->get('fontsize');
// for the case when there is no config file (this is supported)
if (empty($current_size)) {
if (isset($_COOKIE['pma_fontsize'])) {
$current_size = $_COOKIE['pma_fontsize'];
} else {
$current_size = '82%';
}
}
$options = PMA_Config::_getFontsizeOptions($current_size);
$return = '<label for="select_fontsize">' . $GLOBALS['strFontSize'] . ':</label>' . "\n";

2
themes/darkblue_orange/css/theme_right.css.php
View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/
/* general tags */
html {
font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
}
input, select, textarea {

2
themes/original/css/theme_left.css.php
View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/
/* general tags */
html {
font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
}
input, select, textarea {

2
themes/original/css/theme_right.css.php
View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/
/* general tags */
html {
font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
}
input, select, textarea {