aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-09 15:18:48 +1100
committerfriendica <info@friendica.com>2014-03-09 15:18:48 +1100
commit32f288bb59ad38ddfc84337fab3c2f4a5a15e4e2 (patch)
treead49d19e8be0c2e8384e3371b2ea3a48b6e6feb9
parent80e381176e1e301782bc56cbb7c6037825eddf2d (diff)
parent8be35d60cf8e4dee4ffc3e9cc090ebb722d72290 (diff)
downloadvolse-hubzilla-32f288bb59ad38ddfc84337fab3c2f4a5a15e4e2.tar.gz
volse-hubzilla-32f288bb59ad38ddfc84337fab3c2f4a5a15e4e2.tar.bz2
volse-hubzilla-32f288bb59ad38ddfc84337fab3c2f4a5a15e4e2.zip
Merge pull request #361 from cvogeley/master
allow again zrl and zmg in api
-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();