diff options
| author | zottel <github@zottel.net> | 2012-04-09 02:20:34 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-09 02:20:34 +0200 |
| commit | 7cf946e004b45fdcd7e2dc513ab42c8531fe126b (patch) | |
| tree | b9a2b6e2efc31ada403fb5ff56204bac376ef7d5 /mod/wall_upload.php | |
| parent | 315d496290747aab8b3147dc24b822460071bb2d (diff) | |
| parent | 63c881b50d1ce4da50763d8a806c68658865ca17 (diff) | |
| download | volse-hubzilla-7cf946e004b45fdcd7e2dc513ab42c8531fe126b.tar.gz volse-hubzilla-7cf946e004b45fdcd7e2dc513ab42c8531fe126b.tar.bz2 volse-hubzilla-7cf946e004b45fdcd7e2dc513ab42c8531fe126b.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/wall_upload.php')
| -rw-r--r-- | mod/wall_upload.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 64f174a78..f341cc9cd 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -6,7 +6,7 @@ function wall_upload_post(&$a) { if($a->argc > 1) { $nick = $a->argv[1]; - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", + $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1", dbesc($nick) ); if(! count($r)) @@ -16,10 +16,13 @@ function wall_upload_post(&$a) { else return; + + $can_post = false; $visitor = 0; $page_owner_uid = $r[0]['uid']; + $default_cid = $r[0]['id']; $page_owner_nick = $r[0]['nickname']; $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); @@ -34,6 +37,7 @@ function wall_upload_post(&$a) { if(count($r)) { $can_post = true; $visitor = remote_user(); + $default_cid = $visitor; } } } @@ -76,7 +80,7 @@ function wall_upload_post(&$a) { $smallest = 0; - $defperm = '<' . $page_owner_uid . '>'; + $defperm = '<' . $default_cid . '>'; $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm); |