harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a mysql error which popped up in the dbfail log

Browse Source
This commit is contained in:
friendica 2014-02-11 20:45:17 -08:00
parent 655b6445d5
commit 7f3f981d96
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/settings.php
View File

@ -39,7 +39,7 @@ function settings_post(&$a) {
if(! local_user()) if(! local_user())
return; return;
// logger('mod_settings: ' . print_r($_REQUEST,true)); // logger('mod_settings: ' . print_r($_REQUEST,true));
if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
return; return;

4
mod/thing.php
View File

@ -199,14 +199,14 @@ function thing_init(&$a) {
if(! $profile['is_default']) { if(! $profile['is_default']) {
$arr['item_private'] = true; $arr['item_private'] = true;
$str = ''; $str = '';
$r = q("select abook_hash from abook where abook_channel = %d and abook_profile = '%s'", $r = q("select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'",
intval(local_user()), intval(local_user()),
dbesc($profile_guid) dbesc($profile_guid)
); );
if($r) { if($r) {
$arr['allow_cid'] = ''; $arr['allow_cid'] = '';
foreach($r as $rr) foreach($r as $rr)
$arr['allow_cid'] .= '<' . $rr['abook_hash'] . '>'; $arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>';
} }
else else
$arr['allow_cid'] = '<' . get_observer_hash() . '>'; $arr['allow_cid'] = '<' . get_observer_hash() . '>';