Simplify image url

[friendica.git] / src / Content / Text / HTML.php

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index c65e1d9820368d488f595aefb8e0f297a42d1a52..988274f8dcba5567ec59247141d7d37d3dc60bc8 100644 (file)
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -24,7 +24,6 @@ namespace Friendica\Content\Text;
 use DOMDocument;
 use DOMXPath;
 use Friendica\Protocol\HTTP\MediaType;
-use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
@@ -281,9 +280,9 @@ class HTML
                        self::tagToBBCode($doc, 'div', [], "\r", "\r");
                        self::tagToBBCode($doc, 'p', [], "\n", "\n");
 
-                       self::tagToBBCode($doc, 'ul', [], "[list]", "[/list]");
-                       self::tagToBBCode($doc, 'ol', [], "[list=1]", "[/list]");
-                       self::tagToBBCode($doc, 'li', [], "[*]", "");
+                       self::tagToBBCode($doc, 'ul', [], "[ul]", "\n[/ul]");
+                       self::tagToBBCode($doc, 'ol', [], "[ol]", "\n[/ol]");
+                       self::tagToBBCode($doc, 'li', [], "\n[li]", "[/li]");
 
                        self::tagToBBCode($doc, 'hr', [], "[hr]", "");
 
@@ -349,33 +348,6 @@ class HTML
                                $message = str_replace("\n\n\n", "\n\n", $message);
                        } while ($oldmessage != $message);
 
-                       do {
-                               $oldmessage = $message;
-                               $message = str_replace(
-                                       [
-                                               "[/size]\n\n",
-                                               "\n[hr]",
-                                               "[hr]\n",
-                                               "\n[list",
-                                               "[/list]\n",
-                                               "\n[/",
-                                               "[list]\n",
-                                               "[list=1]\n",
-                                               "\n[*]"],
-                                       [
-                                               "[/size]\n",
-                                               "[hr]",
-                                               "[hr]",
-                                               "[list",
-                                               "[/list]",
-                                               "[/",
-                                               "[list]",
-                                               "[list=1]",
-                                               "[*]"],
-                                       $message
-                               );
-                       } while ($message != $oldmessage);
-
                        $message = str_replace(
                                ['[b][b]', '[/b][/b]', '[i][i]', '[/i][/i]'],
                                ['[b]', '[/b]', '[i]', '[/i]'],
@@ -869,7 +841,7 @@ class HTML
         *
         * @param string $s     Search query.
         * @param string $id    HTML id
-        * @param bool   $aside Display the search widgit aside.
+        * @param bool   $aside Display the search widget aside.
         *
         * @return string Formatted HTML.
         * @throws \Exception
@@ -1032,7 +1004,7 @@ class HTML
                // the quotes, e.g.:
                //
                //    concat("'foo'", '"', "bar")
-               return 'concat(' . implode(', \'"\', ', array_map(['self', 'xpathQuote'], explode('"', $value))) . ')';
+               return 'concat(' . implode(', \'"\', ', array_map([self::class, 'xpathQuote'], explode('"', $value))) . ')';
        }
 
        /**