From 0f4658f40ec6b9ad44f24b132590f102a92ae0f2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 10 Oct 2007 16:56:22 +0000 Subject: [PATCH] Font size detection was no longer working --- ChangeLog | 2 ++ libraries/Config.class.php | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f61d0f2ff..87296be89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Alex Rambau - bug #1807923 [login] Login with html entities in password fails - [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) - bug #1810629 [setup] XSS in setup.php, thanks to Omer Singer, The DigiTrust Group diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 8047565a1..9982205b1 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -544,8 +544,7 @@ class PMA_Config */ function getMtime() { - return $this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info; - //"max()" most probably would only returns "source" last modified timestamp. + return intval($_SESSION['PMA_Config']->get('fontsize')) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info); } /**