diff options
author | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
commit | db9ea66069f2a2df6044e8267a68eae377c45911 (patch) | |
tree | aa93597df2ee43ceeaa980db864b58143f2e06df /Zotlabs/Module/File_upload.php | |
parent | ef02464e3c3188563349bfda42585ce40cdb45ad (diff) | |
parent | c2830c4a98cf3c9983b3c4b61024d52a6d7187df (diff) | |
download | volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.gz volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.bz2 volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.zip |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
Diffstat (limited to 'Zotlabs/Module/File_upload.php')
-rw-r--r-- | Zotlabs/Module/File_upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php index d5c0c7e05..769134808 100644 --- a/Zotlabs/Module/File_upload.php +++ b/Zotlabs/Module/File_upload.php @@ -12,7 +12,7 @@ class File_upload extends \Zotlabs\Web\Controller { // logger('file upload: ' . print_r($_REQUEST,true)); - $channel = (($_REQUEST['channick']) ? get_channel_by_nick($_REQUEST['channick']) : null); + $channel = (($_REQUEST['channick']) ? channelx_by_nick($_REQUEST['channick']) : null); if(! $channel) { logger('channel not found'); |