aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-08 21:15:52 -0800
committerfriendica <info@friendica.com>2014-03-08 21:15:52 -0800
commit58f307676be475426ee42936eb5a27135b128d6a (patch)
treefe53f3dbd060ce251f46363843c81052f1807245
parent66dc228be81d0ca78e1689f675a8040ee92f0016 (diff)
parent32f288bb59ad38ddfc84337fab3c2f4a5a15e4e2 (diff)
downloadvolse-hubzilla-58f307676be475426ee42936eb5a27135b128d6a.tar.gz
volse-hubzilla-58f307676be475426ee42936eb5a27135b128d6a.tar.bz2
volse-hubzilla-58f307676be475426ee42936eb5a27135b128d6a.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--mod/wall_upload.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 2939cf0d1..f83f4f7cf 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -45,11 +45,10 @@ function wall_upload_post(&$a) {
$m = $ret['body'];
- // This might make Friendica for Android uploads work again, as it won't have any knowledge of zrl and zmg tags
- // and these tags probably aren't useful with other client apps.
+
if($using_api)
- return(str_replace(array('zrl','zmg'),array('url','img'),$ret['body']));
+ return("\n\n" . $ret['body'] . "\n\n");
else
echo "\n\n" . $ret['body'] . "\n\n";
killme();