diff options
| author | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
| commit | fd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (patch) | |
| tree | 5c37812ef7baeadc17fce088c4394d25f75b593c /mod/magic.php | |
| parent | c993ddd86ee25832e35e65333fa25b396e7aefdf (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.gz volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.bz2 volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.zip | |
Merge branch 'master' into pocorate
Diffstat (limited to 'mod/magic.php')
| -rw-r--r-- | mod/magic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/magic.php b/mod/magic.php index aead559a7..c31fa71ae 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -76,7 +76,7 @@ function magic_init(&$a) { // By default, we'll proceed without asking. $arr = array( - 'channel_id' => local_user(), + 'channel_id' => local_channel(), 'xchan' => $x[0], 'destination' => $dest, 'proceed' => true @@ -103,7 +103,7 @@ function magic_init(&$a) { goaway($dest); } - if(local_user()) { + if(local_channel()) { $channel = $a->get_channel(); $token = random_string(); |