diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-08-25 10:00:38 -0700 | 
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-08-25 10:00:38 -0700 | 
| commit | dccc333c765bb28da55b4a55d9c916acdb88413a (patch) | |
| tree | bdd26a0b4cd85241a19b7fcb2c0770f0ac3eb9f0 /engine/lib/configuration.php | |
| parent | ec7b94a64aef23b85866ecdac8e8acc712d29bb6 (diff) | |
| parent | 003cb81c7888f4d2fd763e5814027c6f8d71186f (diff) | |
| download | elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.gz elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.bz2  | |
Merge branch 'master' of github.com:brettp/Elgg
Diffstat (limited to 'engine/lib/configuration.php')
| -rw-r--r-- | engine/lib/configuration.php | 19 | 
1 files changed, 11 insertions, 8 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php index cbc083bd0..b756d2e70 100644 --- a/engine/lib/configuration.php +++ b/engine/lib/configuration.php @@ -282,8 +282,8 @@ function datalist_set($name, $value) {  		return false;  	} -	$name = sanitise_string($name); -	$value = sanitise_string($value); +	$sanitised_name = sanitise_string($name); +	$sanitised_value = sanitise_string($value);  	// If memcache is available then invalidate the cached copy  	static $datalist_memcache; @@ -295,13 +295,16 @@ function datalist_set($name, $value) {  		$datalist_memcache->delete($name);  	} -	insert_data("INSERT into {$CONFIG->dbprefix}datalists" -		. " set name = '{$name}', value = '{$value}'" -		. " ON DUPLICATE KEY UPDATE value='{$value}'"); - -	$DATALIST_CACHE[$name] = $value; +	$success = insert_data("INSERT into {$CONFIG->dbprefix}datalists" +		. " set name = '{$sanitised_name}', value = '{$sanitised_value}'" +		. " ON DUPLICATE KEY UPDATE value='{$sanitised_value}'"); -	return true; +	if ($success) { +		$DATALIST_CACHE[$name] = $value; +		return true; +	} else { +		return false; +	}  }  /**  | 
