jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1403 from annando/issue-1228

Browse source 
Issue 1228: Pictures aren't sent via API in comments.
This commit is contained in:
Tobias Diekershoff 2015-02-19 09:25:41 +01:00
commit 29bd6c9853
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/api.php
View file

@ -733,8 +733,7 @@
$_REQUEST['body'] = html2bbcode($txt);
}
}
else
} else
$_REQUEST['body'] = requestdata('status');
$_REQUEST['title'] = requestdata('title');
@ -811,14 +810,15 @@
}
$_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