1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00

URL condig rebuild routine on various places,

Import prefs fix - arrays wasn't imported,
Mislogic of some preference handler methods
This commit is contained in:
secretr
2012-01-06 09:49:08 +00:00
parent b701180324
commit 34b40eddfb
6 changed files with 283 additions and 266 deletions

View File

@@ -195,11 +195,11 @@ class e_pref extends e_front_model
public function set($pref_name, $value)
{
global $pref;
if(empty($pref_name))
if(empty($pref_name) || !is_string($pref_name))
{
return $this;
}
parent::set((string) $pref_name, $value, false);
$this->_data[$pref_name] = $value;
//BC
if($this->alias === 'core')
@@ -220,11 +220,11 @@ class e_pref extends e_front_model
public function update($pref_name, $value)
{
global $pref;
if(empty($pref_name))
if(empty($pref_name) || !is_string($pref_name))
{
return $this;
}
parent::set((string) $pref_name, $value, true);
if(isset($this->_data[$pref_name])) $this->_data[$pref_name] = $value;
//BC
if($this->alias === 'core')
@@ -249,8 +249,13 @@ class e_pref extends e_front_model
{
return $this;
}
$this->addData($pref_name, $value);
if(!isset($this->_data[$pref_name])) $this->_data[$pref_name] = $value;
//BC
if($this->alias === 'core')
{
$pref = $this->getData();
}
return $this;
}
@@ -633,7 +638,7 @@ class e_pref extends e_front_model
* @param boolean $runtime clear runtime cache as well ($this->pref_cache)
* @return e_pref
*/
protected function clearPrefCache($cache_name = '', $runtime = true)
public function clearPrefCache($cache_name = '', $runtime = true)
{
if($runtime)
{