diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-04-27 22:43:26 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-04-27 22:43:26 +0530 |
| commit | 214ec91a3f2c5fec6cced93f669b3a9725f0e40a (patch) | |
| tree | d05fd4c7e65cc89cf46d8347a2d0e6df135ed864 /include/api.php | |
| parent | f1d84c10458986a0a014f844e784617401764b29 (diff) | |
| parent | 4b92e3543c9af26e590cfecf561ff7483e66e6c9 (diff) | |
| download | volse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.tar.gz volse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.tar.bz2 volse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 11 |
1 files changed, 10 insertions, 1 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 |