aboutsummaryrefslogtreecommitdiffstats
path: root/include/api.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 00:28:23 -0800
committerfriendica <info@friendica.com>2015-01-29 00:28:23 -0800
commitfd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (patch)
tree5c37812ef7baeadc17fce088c4394d25f75b593c /include/api.php
parentc993ddd86ee25832e35e65333fa25b396e7aefdf (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.gz
volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.bz2
volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.zip
Merge branch 'master' into pocorate
Diffstat (limited to 'include/api.php')
-rw-r--r--include/api.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/api.php b/include/api.php
index 51de412cf..d00cdcf8a 100644
--- a/include/api.php
+++ b/include/api.php
@@ -48,7 +48,7 @@ require_once('include/items.php');
}
}
if ($_SESSION["allow_api"])
- return local_user();
+ return local_channel();
return false;
}
@@ -308,7 +308,7 @@ require_once('include/items.php');
api_login($a);
return False;
} else {
- $user = local_user();
+ $user = local_channel();
$extra_query = " AND abook_channel = %d AND (abook_flags & " . ABOOK_FLAG_SELF . " )>0 ";
}