aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-11 20:45:17 -0800
committerfriendica <info@friendica.com>2014-02-11 20:45:17 -0800
commit7f3f981d96338093ed8a01597e80916c6d8ea212 (patch)
tree11f417e36a69de3092d726cbdd19e52aae08f55a
parent655b6445d5f3354b0af3b9ee22b33be828499d41 (diff)
downloadvolse-hubzilla-7f3f981d96338093ed8a01597e80916c6d8ea212.tar.gz
volse-hubzilla-7f3f981d96338093ed8a01597e80916c6d8ea212.tar.bz2
volse-hubzilla-7f3f981d96338093ed8a01597e80916c6d8ea212.zip
fix a mysql error which popped up in the dbfail log
-rw-r--r--mod/settings.php2
-rw-r--r--mod/thing.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/settings.php b/mod/settings.php
index c5aff62b8..506141a1f 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -39,7 +39,7 @@ function settings_post(&$a) {
if(! local_user())
return;
-// logger('mod_settings: ' . print_r($_REQUEST,true));
+ // logger('mod_settings: ' . print_r($_REQUEST,true));
if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
return;
diff --git a/mod/thing.php b/mod/thing.php
index 9b362cecd..2620d660e 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -199,14 +199,14 @@ function thing_init(&$a) {
if(! $profile['is_default']) {
$arr['item_private'] = true;
$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()),
dbesc($profile_guid)
);
if($r) {
$arr['allow_cid'] = '';
foreach($r as $rr)
- $arr['allow_cid'] .= '<' . $rr['abook_hash'] . '>';
+ $arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>';
}
else
$arr['allow_cid'] = '<' . get_observer_hash() . '>';