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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2010-08-28 12:40:25 +02:00
parent a3b2032d26 c0482e135b
commit 9c8b3de987
4 changed files with 19 additions and 13 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
*
* @uses $GLOBALS['cfg']
* @uses PMA_array_read()
* @uses PMA_array_remove()
* @uses PMA_array_write()
* @param string $path
@@ -190,13 +192,17 @@ class ConfigFile
return;
}
// 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])
&& (($value === $default_value) || (empty($value) && empty($default_value)))) {
PMA_array_remove($path, $_SESSION[$this->id]);
} else {
PMA_array_write($path, $_SESSION[$this->id], $value);
if (!isset($this->persistKeys[$canonical_path])) {
$default_value = $this->getDefault($canonical_path);
// check $GLOBALS['cfg'] to allow overwriting options set in config.inc.php with default value
$current_global = PMA_array_read($canonical_path, $GLOBALS['cfg']);
if (($value === $default_value && (defined('PMA_SETUP') || $current_global === $default_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);
}
/**

6
libraries/config/FormDisplay.class.php
View File

@@ -498,7 +498,7 @@ class FormDisplay
$values = array();
$to_save = array();
$is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
$is_setup_script = defined('PMA_SETUP');
if ($is_setup_script) {
$this->_loadUserprefsInfo();
}
@@ -706,7 +706,7 @@ class FormDisplay
if ($this->userprefs_keys === null) {
$this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames());
// read real config for user preferences display
$userprefs_disallow = defined('PMA_SETUP') && PMA_SETUP
$userprefs_disallow = defined('PMA_SETUP')
? ConfigFile::getInstance()->get('UserprefsDisallow', array())
: $GLOBALS['cfg']['UserprefsDisallow'];
$this->userprefs_disallow = array_flip($userprefs_disallow);
@@ -767,7 +767,7 @@ class FormDisplay
}
}
}
if (!defined('PMA_SETUP') || !PMA_SETUP) {
if (!defined('PMA_SETUP')) {
if (($system_path == 'MaxDbList' || $system_path == 'MaxTableList'
|| $system_path == 'QueryHistoryMax')) {
$opts['comment'] = sprintf(__('maximum %s'), $GLOBALS['cfg'][$system_path]);

6
libraries/config/FormDisplay.tpl.php
View File

@@ -132,7 +132,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
global $_FormDisplayGroup;
static $base_dir, $img_path;
$is_setup_script = defined('PMA_SETUP') && PMA_SETUP;
$is_setup_script = defined('PMA_SETUP');
if ($base_dir === null) {
$base_dir = $is_setup_script ? '../' : '';
$img_path = $is_setup_script
@@ -298,7 +298,7 @@ function display_group_header($header_text)
return;
}
$colspan = 2;
if (defined('PMA_SETUP') && PMA_SETUP) {
if (defined('PMA_SETUP')) {
$colspan++;
}
?>
@@ -328,7 +328,7 @@ function display_group_footer()
function display_fieldset_bottom()
{
$colspan = 2;
if (defined('PMA_SETUP') && PMA_SETUP) {
if (defined('PMA_SETUP')) {
$colspan++;
}
?>

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

@@ -29,7 +29,7 @@ function PMA_config_get_validators()
if ($validators === null) {
$cf = ConfigFile::getInstance();
$validators = $cf->getDbEntry('_validators', array());
if (!defined('PMA_SETUP') || !PMA_SETUP) {
if (!defined('PMA_SETUP')) {
$uvs = $cf->getDbEntry('_userValidators', array());
foreach ($uvs as $field => $uv_list) {
$uv_list = (array)$uv_list;