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

Upper bounds for user prefs were read from already modified settings

Browse Source
This commit is contained in:
Piotr Przybylski
2011-01-11 00:12:47 +01:00
parent 9f8c3c8e60
commit 51684a8362
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/config/validate.lib.php
View File

@@ -30,6 +30,10 @@ function PMA_config_get_validators()
$cf = ConfigFile::getInstance(); $cf = ConfigFile::getInstance();
$validators = $cf->getDbEntry('_validators', array()); $validators = $cf->getDbEntry('_validators', array());
if (!defined('PMA_SETUP')) { if (!defined('PMA_SETUP')) {
// not in setup script: load additional validators for user preferences
// we need oryginal config values not overwritten by user preferences, creating a new PMA_Config
// instance is a better idea than hacking into its code
$org_cfg = new PMA_Config(CONFIG_FILE);
$uvs = $cf->getDbEntry('_userValidators', array()); $uvs = $cf->getDbEntry('_userValidators', array());
foreach ($uvs as $field => $uv_list) { foreach ($uvs as $field => $uv_list) {
$uv_list = (array)$uv_list; $uv_list = (array)$uv_list;
@@ -39,7 +43,7 @@ function PMA_config_get_validators()
} }
for ($i = 1; $i < count($uv); $i++) { for ($i = 1; $i < count($uv); $i++) {
if (substr($uv[$i], 0, 6) == 'value:') { if (substr($uv[$i], 0, 6) == 'value:') {
$uv[$i] = PMA_array_read(substr($uv[$i], 6), $GLOBALS['cfg']); $uv[$i] = PMA_array_read(substr($uv[$i], 6), $org_cfg->settings);
} }
} }
} }