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_attach.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_attach.php')
| -rw-r--r-- | Zotlabs/Module/Wall_attach.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php index 9a1019ddb..c6fe7518e 100644 --- a/Zotlabs/Module/Wall_attach.php +++ b/Zotlabs/Module/Wall_attach.php @@ -12,15 +12,20 @@ class Wall_attach extends \Zotlabs\Web\Controller { $using_api = false; - if(\App::$data['api_info'] && array_key_exists('media',$_FILES)) { + if($_REQUEST['api_source'] && array_key_exists('media',$_FILES)) { $using_api = true; - $user_info = \App::$data['api_info']; - $nick = $user_info['screen_name']; - $channel = get_channel_by_nick($user_info['screen_name']); } - elseif(argc() > 1) - $channel = get_channel_by_nick(argv(1)); - + + if($using_api) { + require_once('include/api.php'); + if(api_user()) + $channel = channelx_by_n(api_user()); + } + else { + if(argc() > 1) + $channel = channelx_by_nick(argv(1)); + } + if(! $channel) killme(); |