aboutsummaryrefslogtreecommitdiffstats
path: root/mod/chat.php
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-07 21:35:18 +0100
committermarijus <mario@localhost.localdomain>2014-02-07 21:35:18 +0100
commit4c0f9a91b95025f08e3c4e2739cb5f4186726023 (patch)
tree3b19b8c3aa086e4931aac9790d298b2306f71ff7 /mod/chat.php
parentc26ae94592dda51a40903ea65f117fd7dd9d0ef3 (diff)
parentf62ec4132ed571288737423de386054a4cc8b0d5 (diff)
downloadvolse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.tar.gz
volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.tar.bz2
volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.zip
Merge branch 'upstream'
Diffstat (limited to 'mod/chat.php')
-rw-r--r--mod/chat.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/mod/chat.php b/mod/chat.php
index e3725830c..872571f8c 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -79,6 +79,9 @@ function chat_post(&$a) {
function chat_content(&$a) {
+ if(local_user())
+ $channel = $a->get_channel();
+
$observer = get_observer_hash();
if(! $observer) {
notice( t('Permission denied.') . EOL);
@@ -129,7 +132,7 @@ function chat_content(&$a) {
if(local_user() && argc() > 2 && argv(2) === 'new') {
- $channel = $a->get_channel();
+
$channel_acl = array(
'allow_cid' => $channel['channel_allow_cid'],
'allow_gid' => $channel['channel_allow_gid'],