patch goes to 2.11.1 instead of 2.11.2

This commit is contained in:
Marc Delisle
2007-09-18 12:10:53 +00:00
parent 5e87087b3d
commit 7305733c3e
2 changed files with 5 additions and 2 deletions

View File

@@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1791568 [core] Undefined cfg, thanks to Christian Schmidt
- bug #1782332 [structure] New table form does not overtake data
- bug #1793763 [requirements] minimum PHP should be 4.2.0
- patch #1787915 Avoid CSS reloading on every click, thanks to Juergen Wind
2.11.0.0 (2007-08-21)

View File

@@ -538,12 +538,14 @@ class PMA_Config
}
/**
* returns time of last config change.
* returns a unique value to force a CSS reload if either the config
* or the theme changes
* @return int Unix timestamp
*/
function getMtime()
{
return max($this->source_mtime, $this->default_source_mtime, $this->set_mtime);
return $this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info;
//"max()" most probably would only returns "source" last modified timestamp.
}
/**