diff options
| author | zottel <github@zottel.net> | 2014-02-21 08:54:46 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-02-21 08:54:46 +0100 |
| commit | 8bd006bea83b3dbc02d94b4714a658e8742d9633 (patch) | |
| tree | 078e9d4b634d583de8359ddae94c69d86ec19d17 /mod/wall_upload.php | |
| parent | 79c566bda33645f42f8545fdc6e55af35c4a7d5c (diff) | |
| parent | 44d7047fce57085fe63ad5e1088911e9fc07a32e (diff) | |
| download | volse-hubzilla-8bd006bea83b3dbc02d94b4714a658e8742d9633.tar.gz volse-hubzilla-8bd006bea83b3dbc02d94b4714a658e8742d9633.tar.bz2 volse-hubzilla-8bd006bea83b3dbc02d94b4714a658e8742d9633.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/wall_upload.php')
| -rw-r--r-- | mod/wall_upload.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mod/wall_upload.php b/mod/wall_upload.php index dd5d760b3..2939cf0d1 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -1,6 +1,7 @@ <?php require_once('include/photo/photo_driver.php'); +require_once('include/identity.php'); require_once('include/photos.php'); @@ -19,15 +20,7 @@ function wall_upload_post(&$a) { $nick = argv(1); } - $channel = null; - - if($nick) { - $r = q("SELECT channel.* from channel where channel_address = '%s' limit 1", - dbesc($nick) - ); - if($r) - $channel = $r[0]; - } + $channel = (($nick) ? get_channel_by_nick($nick) : false); if(! $channel) { if($using_api) |