Move undo_post_tagging to mod/editpost because of the only occurrence

diff --git a/include/text.php b/include/text.php
index 2050e57026e77453560e4a81f6e53f56358289e7..0935c5e7409a562f9c0c021c754d01627c560b46 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -6,7 +6,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Protocol;
-use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\Group;
 use Friendica\Util\Strings;
@@ -240,21 +239,6 @@ function bb_translate_video($s) {
        return $s;
 }
 
-function undo_post_tagging($s) {
-       $matches = null;
-       $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism', $s, $matches, PREG_SET_ORDER);
-       if ($cnt) {
-               foreach ($matches as $mtch) {
-                       if (in_array($mtch[1], ['!', '@'])) {
-                               $contact = Contact::getDetailsByURL($mtch[2]);
-                               $mtch[3] = empty($contact['addr']) ? $mtch[2] : $contact['addr'];
-                       }
-                       $s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
-               }
-       }
-       return $s;
-}
-
 /// @TODO Rewrite this
 function is_a_date_arg($s) {
        $i = intval($s);

diff --git a/mod/editpost.php b/mod/editpost.php
index e14baffa28aca2cad4f483c097cc38487a9194c1..690cb2ac0d0947d40da1e0a5b9c6994b8f0653d8 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -8,9 +8,10 @@ use Friendica\Content\Feature;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\Item;
-use Friendica\Database\DBA;
 use Friendica\Util\Crypto;
 
 function editpost_content(App $a)
@@ -118,3 +119,18 @@ function editpost_content(App $a)
 
        return $o;
 }
+
+function undo_post_tagging($s) {
+       $matches = null;
+       $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism', $s, $matches, PREG_SET_ORDER);
+       if ($cnt) {
+               foreach ($matches as $mtch) {
+                       if (in_array($mtch[1], ['!', '@'])) {
+                               $contact = Contact::getDetailsByURL($mtch[2]);
+                               $mtch[3] = empty($contact['addr']) ? $mtch[2] : $contact['addr'];
+                       }
+                       $s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
+               }
+       }
+       return $s;
+}