We don't need __wakeup in PMA_Config as it is no longer in session.
This commit is contained in:
@@ -298,32 +298,6 @@ class PMA_Config
|
||||
$this->set('PMA_PHP_STR_VERSION', phpversion());
|
||||
}
|
||||
|
||||
/**
|
||||
* re-init object after loading from session file
|
||||
* checks config file for changes and relaods if neccessary
|
||||
*/
|
||||
function __wakeup()
|
||||
{
|
||||
if (SKIP_MTIME_CONFIG_CHECK
|
||||
|| ! $this->checkConfigSource()
|
||||
|| $this->source_mtime !== filemtime($this->getSource())
|
||||
|| $this->default_source_mtime !== filemtime($this->default_source)
|
||||
|| $this->error_config_file
|
||||
|| $this->error_config_default_file) {
|
||||
$this->settings = array();
|
||||
$this->load();
|
||||
$this->checkSystem();
|
||||
}
|
||||
|
||||
// check for https needs to be done everytime,
|
||||
// as https and http uses same session so this info can not be stored
|
||||
// in session
|
||||
$this->checkIsHttps();
|
||||
|
||||
$this->checkCollationConnection();
|
||||
$this->checkFontsize();
|
||||
}
|
||||
|
||||
/**
|
||||
* loads default values from default source
|
||||
*
|
||||
@@ -356,8 +330,7 @@ class PMA_Config
|
||||
|
||||
/**
|
||||
* loads configuration from $source, usally the config file
|
||||
* should be called on object creation and from __wakeup if config file
|
||||
* has changed
|
||||
* should be called on object creation
|
||||
*
|
||||
* @param string $source config file
|
||||
*/
|
||||
|
@@ -34,11 +34,4 @@ define('SETUP_CONFIG_FILE', './config/config.inc.php');
|
||||
*/
|
||||
define('SETUP_DIR_WRITABLE', true);
|
||||
|
||||
/**
|
||||
* Whether to skip mtime check on config file and load it on every request.
|
||||
* This has slight performance drawback, but it is the only way to handle
|
||||
* inclusions of other php scripts from config.
|
||||
*/
|
||||
define('SKIP_MTIME_CONFIG_CHECK', false);
|
||||
|
||||
?>
|
||||
|
Reference in New Issue
Block a user