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 0c5bf4a983
commit 3aca3caafb
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1989813 [interface] Deleting multiple views (space in name) - bug #1989813 [interface] Deleting multiple views (space in name)
- bug #1992628 [parser] SQL parser removes essential space - bug #1992628 [parser] SQL parser removes essential space
- bug #1989281 [export] CSV for MS Excel incorrect escaping of double quotes - bug #1989281 [export] CSV for MS Excel incorrect escaping of double quotes
- bug #1959855 [interface] Font size option problem when no config file
2.11.7.0 (2008-06-23) 2.11.7.0 (2008-06-23)
- bug #1908719 [interface] New field cannot be auto-increment and primary key - bug #1908719 [interface] New field cannot be auto-increment and primary key

14
libraries/Config.class.php
View File

@@ -545,12 +545,14 @@ class PMA_Config
/** /**
* returns a unique value to force a CSS reload if either the config * returns a unique value to force a CSS reload if either the config
* or the theme changes * or the theme changes;
* must also check the pma_fontsize cookie in case there is no
* config file
* @return int Unix timestamp * @return int Unix timestamp
*/ */
function getThemeUniqueValue() 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);
} }
/** /**
@@ -1003,6 +1005,14 @@ class PMA_Config
function getFontsizeSelection() function getFontsizeSelection()
{ {
$current_size = $_SESSION['PMA_Config']->get('fontsize'); $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); $options = PMA_Config::getFontsizeOptions($current_size);
$return = '<label for="select_fontsize">' . $GLOBALS['strFontSize'] . ':</label>' . "\n"; $return = '<label for="select_fontsize">' . $GLOBALS['strFontSize'] . ':</label>' . "\n";

2
phpmyadmin.css.php
View File

@@ -39,7 +39,7 @@ header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
?> ?>
html { 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 { input, select, textarea {