aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-03 21:13:17 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-03 21:13:17 -0700
commit6826b4ad32ce4b2799188f3baf4f99faec03cd0f (patch)
tree76c1a2eb1b6caa3c242711ac8c884c3328643482 /include
parentae15dde8fb657a9fd842600e3932d7f2b410eb70 (diff)
downloadvolse-hubzilla-6826b4ad32ce4b2799188f3baf4f99faec03cd0f.tar.gz
volse-hubzilla-6826b4ad32ce4b2799188f3baf4f99faec03cd0f.tar.bz2
volse-hubzilla-6826b4ad32ce4b2799188f3baf4f99faec03cd0f.zip
these were some really difficult bugs to find
Diffstat (limited to 'include')
-rw-r--r--include/follow.php3
-rwxr-xr-xinclude/items.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/include/follow.php b/include/follow.php
index 1e5df4cd5..54e16703d 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -265,8 +265,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
);
if($r) {
$result['abook'] = $r[0];
- if($is_red)
- proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']);
+ proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']);
}
$arr = array('channel_id' => $uid, 'abook' => $result['abook']);
diff --git a/include/items.php b/include/items.php
index c807c1d5d..a14e47e0f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -161,7 +161,7 @@ function filter_insecure($channel_id, $arr) {
$ret = array();
- if((! intval(get_config($channel_id, 'system', 'filter_insecure_collections'))) || (! $arr))
+ if((! intval(get_pconfig($channel_id, 'system', 'filter_insecure_collections'))) || (! $arr))
return $arr;
$str = '';