diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-12-23 10:09:46 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-12-23 10:09:46 +0100 |
| commit | 3b9b03cf86979b28e7fa249133176bed84b0105c (patch) | |
| tree | 336dc8b8b9627e7f4a93e5c35fe3e98555274616 /Zotlabs/Module/Wall_upload.php | |
| parent | 2e5a993f880d619aedf3693927e7b3e164fbfcc0 (diff) | |
| parent | ef39c1e94b5149a3019d417d08dc7c16c8aef9c1 (diff) | |
| download | volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.tar.gz volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.tar.bz2 volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.zip | |
Merge branch '2.0RC'
Diffstat (limited to 'Zotlabs/Module/Wall_upload.php')
| -rw-r--r-- | Zotlabs/Module/Wall_upload.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php index 3868cb14e..6d58e4032 100644 --- a/Zotlabs/Module/Wall_upload.php +++ b/Zotlabs/Module/Wall_upload.php @@ -17,16 +17,14 @@ class Wall_upload extends \Zotlabs\Web\Controller { if($using_api) { require_once('include/api.php'); - $user_info = api_get_user($a); - $nick = $user_info['screen_name']; + if(api_user()) + $channel = channelx_by_n(api_user()); } else { if(argc() > 1) - $nick = argv(1); + $channel = channelx_by_nick(argv(1)); } - $channel = (($nick) ? get_channel_by_nick($nick) : false); - if(! $channel) { if($using_api) return; |