diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-22 22:22:52 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-22 22:22:52 -0400 |
| commit | 29d7f260d7e6dc178862c6a6c16445ef9b3512e4 (patch) | |
| tree | 3746742dc12c2863c61c4c7cba8f4f9666590e49 /include/api.php | |
| parent | 75c228fa13d814c772db4e072dfc615eed29d206 (diff) | |
| parent | 2170df897b9dc72b87cc104520f6a67ddfbb994f (diff) | |
| download | volse-hubzilla-29d7f260d7e6dc178862c6a6c16445ef9b3512e4.tar.gz volse-hubzilla-29d7f260d7e6dc178862c6a6c16445ef9b3512e4.tar.bz2 volse-hubzilla-29d7f260d7e6dc178862c6a6c16445ef9b3512e4.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bug #388 - notify_comment received after post deleted
don't allow non-existent themes as choices
diabook-themes: bugfix
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
api: add support for StatusNet-style media param to API
Add a hook
* master:
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 |