aboutsummaryrefslogtreecommitdiffstats
path: root/mod/wall_upload.php
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-04-09 14:28:21 +0200
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-04-09 14:28:21 +0200
commit1370ba5d162c7a1b9931c479e2f95dfd31d13b33 (patch)
tree1710427bd23b0928d824418a80b08c676f1820ac /mod/wall_upload.php
parent7187516718639fe93a9fb8fa78960bce85c7eaca (diff)
parent84142076a10b5ae52945ffc9b53e1626c5821525 (diff)
downloadvolse-hubzilla-1370ba5d162c7a1b9931c479e2f95dfd31d13b33.tar.gz
volse-hubzilla-1370ba5d162c7a1b9931c479e2f95dfd31d13b33.tar.bz2
volse-hubzilla-1370ba5d162c7a1b9931c479e2f95dfd31d13b33.zip
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'mod/wall_upload.php')
-rw-r--r--mod/wall_upload.php8
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);