clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse Source 
Conflicts:
	include/config.php
	update.php
This commit is contained in:
Alexander Kampmann
2012-04-05 13:39:15 +02:00
parent cbf4544887 9b6e91086b
commit 355c42cb30
1809 changed files with 48790 additions and 7152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/config.php
+7 -4
View File
@@ -81,11 +81,13 @@ if(! function_exists('get_config')) {
* Return the value, or false if the database update failed
*/
if(! function_exists('set_config')) {
function set_config($family,$key,$value) {
global $a;
// manage array value
$dbvalue = (is_array($value)?serialize($value):$value);
function set_config($family,$key,$value) {
global $a;
// manage array value
$dbvalue = (is_array($value)?serialize($value):$value);
$dbvalue = (is_bool($value) ? intval($value) : $value);
$a->config[$family][$key] = $value;
$ret = q("REPLACE INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
@@ -191,6 +193,7 @@ if(! function_exists('set_pconfig')) {
// manage array value
$dbvalue = (is_array($value)?serialize($value):$value);
$dbvalue = (is_bool($value)?serialize($value):$value);
$a->config[$uid][$family][$key] = $value;