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

user cannot restore a setting to its default value if it's set in config.inc.php

Browse Source
This commit is contained in:
Crack
2010-08-27 15:55:06 +02:00
parent e5042e313b
commit 1dba66c13f
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/config/ConfigFile.class.php
View File

@@ -174,6 +174,8 @@ class ConfigFile
/** /**
* Sets config value * Sets config value
* *
* @uses $GLOBALS['cfg']
* @uses PMA_array_read()
* @uses PMA_array_remove() * @uses PMA_array_remove()
* @uses PMA_array_write() * @uses PMA_array_write()
* @param string $path * @param string $path
@@ -190,13 +192,17 @@ class ConfigFile
return; return;
} }
// remove if the path isn't protected and it's empty or has a default value // remove if the path isn't protected and it's empty or has a default value
$default_value = $this->getDefault($canonical_path); if (!isset($this->persistKeys[$canonical_path])) {
if (!isset($this->persistKeys[$canonical_path]) $default_value = $this->getDefault($canonical_path);
&& (($value === $default_value) || (empty($value) && empty($default_value)))) { // check $GLOBALS['cfg'] to allow overwriting options set in config.inc.php with default value
PMA_array_remove($path, $_SESSION[$this->id]); $current_global = PMA_array_read($canonical_path, $GLOBALS['cfg']);
} else { if (($value === $default_value && (defined('PMA_SETUP') || $current_global === $default_value))
PMA_array_write($path, $_SESSION[$this->id], $value); || (empty($value) && empty($default_value) && (defined('PMA_SETUP') || empty($current_global)))) {
PMA_array_remove($path, $_SESSION[$this->id]);
return;
}
} }
PMA_array_write($path, $_SESSION[$this->id], $value);
} }
/** /**