Merge remote branch 'upstream/master'

[friendica-addons.git] / twitter / twitter.php

diff --git a/twitter/twitter.php b/twitter/twitter.php
index d55e3b73ca92cacb3456e59033df3a5011a080cc..5fd053fa7f95d7b1b09e66bd363fd04ad274dcfe 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -326,9 +326,9 @@ function twitter_post_hook(&$a,&$b) {
                        // recycle 1
                        $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
                        $tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
-                       // recycle 2
-                       //$recycle = html_entity_decode("♻ ", ENT_QUOTES, 'UTF-8');
-                       //$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', 'RT @$2:', $tmp);
+                       // recycle 2 (Test)
+                       $recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8');
+                       $tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
                 }
                 $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
                 $tmp = preg_replace( '/\[bookmark\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/bookmark\]/i', '$2 $1', $tmp);