aboutsummaryrefslogtreecommitdiffstats
path: root/include/api.php
diff options
context:
space:
mode:
authorSebastian Egbers <sebastian@egbers.info>2012-06-26 08:33:41 +0200
committerSebastian Egbers <sebastian@egbers.info>2012-06-26 08:33:41 +0200
commit0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381 (patch)
tree8f38f64f6239f1c132b0e2118a4a9b42ba801752 /include/api.php
parent8c251aebc77a6daacfe20598fc861df4c243a726 (diff)
parenta4b407eb54c67a0c9b8137b44fbd20b43eccb224 (diff)
downloadvolse-hubzilla-0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381.tar.gz
volse-hubzilla-0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381.tar.bz2
volse-hubzilla-0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381.zip
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/api.php')
-rw-r--r--include/api.php19
1 files changed, 10 insertions, 9 deletions
diff --git a/include/api.php b/include/api.php
index 191ed6fcd..0a038b038 100644
--- a/include/api.php
+++ b/include/api.php
@@ -565,18 +565,19 @@
if(requestdata('lat') && requestdata('long'))
$_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long'));
$_REQUEST['profile_uid'] = local_user();
- if(requestdata('parent'))
+
+ if($parent)
$_REQUEST['type'] = 'net-comment';
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;
- }
+ 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