diff options
| author | zottel <github@zottel.net> | 2012-04-23 08:57:49 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-23 08:57:49 +0200 |
| commit | e6847cdd3f6faf087dc7e738e1dbae7d70113451 (patch) | |
| tree | 3746742dc12c2863c61c4c7cba8f4f9666590e49 /include | |
| parent | 9663299da1be50eef4327778fae619fc6f9edef4 (diff) | |
| parent | 2170df897b9dc72b87cc104520f6a67ddfbb994f (diff) | |
| download | volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.tar.gz volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.tar.bz2 volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/api.php | 11 | ||||
| -rw-r--r-- | include/diaspora.php | 2 | ||||
| -rw-r--r-- | include/items.php | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/include/api.php b/include/api.php index 0885a1434..f9be68c3d 100644 --- a/include/api.php +++ b/include/api.php @@ -567,8 +567,17 @@ $_REQUEST['profile_uid'] = local_user(); if(requestdata('parent')) $_REQUEST['type'] = 'net-comment'; - else + else { $_REQUEST['type'] = 'wall'; + if(x($_FILES,'media')) { + // upload the image if we have one + $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo + require_once('mod/wall_upload.php'); + $media = wall_upload_post($a); + if(strlen($media)>0) + $_REQUEST['body'] .= "\n\n".$media; + } + } // set this so that the item_post() function is quiet and doesn't redirect or emit json diff --git a/include/diaspora.php b/include/diaspora.php index 06df9c24a..afd86957b 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1172,7 +1172,7 @@ function diaspora_comment($importer,$xml,$msg) { proc_run('php','include/notifier.php','comment',$message_id); } - $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", + $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ", dbesc($parent_item['uri']), intval($importer['uid']) ); diff --git a/include/items.php b/include/items.php index 0a8bc12c0..07f62ece5 100644 --- a/include/items.php +++ b/include/items.php @@ -2479,7 +2479,7 @@ function local_delivery($importer,$data) { if(!x($datarray['type']) || $datarray['type'] != 'activity') { - $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", + $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0", dbesc($parent_uri), intval($importer['importer_uid']) ); |