Rename properly

rename function properly this time!

diff --git a/include/api.php b/include/api.php
index e4d059c1ea76eaf376a658e5560cce38b3c6a6c8..0f7fa85bdde551dcdb0c2a4ccdfb19e3b254d3fc 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1046,7 +1046,7 @@ function api_statuses_mediap($type)
        //$txt = urldecode(requestdata('status'));
 
        if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
-               $txt = HTML::toBBVideo($txt);
+               $txt = HTML::toBBCodeVideo($txt);
                $config = HTMLPurifier_Config::createDefault();
                $config->set('Cache.DefinitionImpl', null);
                $purifier = new HTMLPurifier($config);
@@ -1092,7 +1092,7 @@ function api_statuses_update($type)
        if (requestdata('htmlstatus')) {
                $txt = requestdata('htmlstatus');
                if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
-                       $txt = HTML::toBBVideo($txt);
+                       $txt = HTML::toBBCodeVideo($txt);
 
                        $config = HTMLPurifier_Config::createDefault();
                        $config->set('Cache.DefinitionImpl', null);

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 8b309e79a48a7046c9c110570b4d1297b8c05cf9..6e3bd571b3297d9f6d7169d30dda69f74e126960 100644 (file)
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -711,7 +711,7 @@ class HTML
         *
         * @param string $s
         */
-       public static function toBBVideo($s)
+       public static function toBBCodeVideo($s)
        {
                $s = preg_replace(
                        '#<object[^>]+>(.*?)https?://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+)(.*?)</object>#ism',

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 4cf7c7b731fa18de27c7f7a3a9affaa8193e59c7..8a2b21745d00a1abb217bf8486ed0f9a73f36f16 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2502,7 +2502,7 @@ class DFRN
                        $base_url = get_app()->getBaseURL();
                        $item['body'] = HTML::relToAbs($item['body'], $base_url);
 
-                       $item['body'] = HTML::toBBVideo($item['body']);
+                       $item['body'] = HTML::toBBCodeVideo($item['body']);
 
                        $item['body'] = OEmbed::HTML2BBCode($item['body']);