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

Check also default config mtime (bug #1467620).

Browse Source
This commit is contained in:
Michal Čihař
2006-04-10 12:54:07 +00:00
parent 48c548e515
commit fd0bb46fa4
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-04-10 Michal Čihař <michal@cihar.com>
* libraries/Config.class.php: Check also default config mtime (bug
#1467620).
2006-04-09 Marc Delisle <lem9@users.sourceforge.net> 2006-04-09 Marc Delisle <lem9@users.sourceforge.net>
* tbl_replace.php, libraries/dbi/mysqli.dbi.lib.php: bug #1255923, * tbl_replace.php, libraries/dbi/mysqli.dbi.lib.php: bug #1255923,
detect and report silent truncation (mysqli only) detect and report silent truncation (mysqli only)

4
libraries/Config.class.php
View File

@@ -27,6 +27,7 @@ class PMA_Config
* @var int source modification time * @var int source modification time
*/ */
var $source_mtime = 0; var $source_mtime = 0;
var $default_source_mtime = 0;
/** /**
* @var boolean * @var boolean
@@ -286,6 +287,7 @@ class PMA_Config
function __wakeup() function __wakeup()
{ {
if (file_exists($this->getSource()) && $this->source_mtime !== filemtime($this->getSource()) if (file_exists($this->getSource()) && $this->source_mtime !== filemtime($this->getSource())
|| $this->default_source_mtime !== filemtime($this->default_source)
|| $this->error_config_file || $this->error_config_default_file) { || $this->error_config_file || $this->error_config_default_file) {
$this->settings = array(); $this->settings = array();
$this->load($this->getSource()); $this->load($this->getSource());
@@ -318,6 +320,8 @@ class PMA_Config
} }
include $this->default_source; include $this->default_source;
$this->default_source_mtime = filemtime($this->default_source);
$this->default_server = $cfg['Servers'][1]; $this->default_server = $cfg['Servers'][1];
unset($cfg['Servers']); unset($cfg['Servers']);