diff options
| author | Michael <icarus@dabo.de> | 2012-04-11 18:48:58 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-11 18:48:58 +0200 |
| commit | 39405c8056b4a1d55c97fb2963d8776695dbeb30 (patch) | |
| tree | c9f89ba0e9aacee343cf50b6b8a64468bb8db694 /mod/wall_upload.php | |
| parent | c3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (diff) | |
| parent | cdb6510b9f3007d2afd3081313caa7d045af1e7c (diff) | |
| download | volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.gz volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.bz2 volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.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); |