diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-09 19:20:51 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-09 19:20:51 -0400 |
| commit | 16c48b220070edc84c4e27bb680498f31066f3ba (patch) | |
| tree | 31876f26f919cb896021fd235ccde8bf6e2ca744 /mod/wall_upload.php | |
| parent | f1db6907860efcd4f48380bb8c0f88272adb91a8 (diff) | |
| parent | 0fd05171d00449d81d060c293dfa0fc7ce814515 (diff) | |
| download | volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.tar.gz volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.tar.bz2 volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bbcode toolbar attached to the comment text field minor css-fixes
diabook-themes: small icon fix
diabook-nav-icons with gradient
use local_user for tag completion if available. See bug #368
more sane defaults datetime_convert
fix empty string timezone
Some new German translations
send zrl after dfrn_request homecoming for manual entries
fix to wall_upload photos default permissions to use cid rather than uid.
fixed z-index of youtube-vids fixed bug to hide right_side
* 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); |