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

Font size detection was no longer working

Browse Source
This commit is contained in:
Marc Delisle
2007-10-10 16:56:22 +00:00
parent 5f7e26003f
commit 0f4658f40e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -17,6 +17,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Alex Rambau thanks to Alex Rambau
- bug #1807923 [login] Login with html entities in password fails - bug #1807923 [login] Login with html entities in password fails
- [core] Undefined variable when creating a table that exists - [core] Undefined variable when creating a table that exists
- patch #1808578 Changes in font size were no longer detected after patch
#1787915
2.11.1.1 (not yet released) 2.11.1.1 (not yet released)
- bug #1810629 [setup] XSS in setup.php, thanks to Omer Singer, The DigiTrust Group - bug #1810629 [setup] XSS in setup.php, thanks to Omer Singer, The DigiTrust Group

3
libraries/Config.class.php
View File

@@ -544,8 +544,7 @@ class PMA_Config
*/ */
function getMtime() function getMtime()
{ {
return $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);
//"max()" most probably would only returns "source" last modified timestamp.
} }
/** /**