diff options
| author | friendica <info@friendica.com> | 2012-06-25 15:34:57 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-25 15:34:57 -0700 |
| commit | 89ad19ce01f396ca71f4a991699871b26cf90b29 (patch) | |
| tree | 7640598f99b1dfddc8a8a77f9ae13f5e438979c2 /include/api.php | |
| parent | eebb2d2120b91c09238e970b2292059a04960aa7 (diff) | |
| parent | d944ff7833355f3bae7befd9c97becf01c4083b1 (diff) | |
| download | volse-hubzilla-89ad19ce01f396ca71f4a991699871b26cf90b29.tar.gz volse-hubzilla-89ad19ce01f396ca71f4a991699871b26cf90b29.tar.bz2 volse-hubzilla-89ad19ce01f396ca71f4a991699871b26cf90b29.zip | |
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/api.php b/include/api.php index b77156dfa..cee1fde23 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(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 |