From 4f07ebb52faa5be4625b4cfece5dd366f746a547 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Tue, 6 Nov 2018 06:34:32 -0500 Subject: [PATCH] Rename properly rename function properly this time! --- include/api.php | 4 ++-- src/Content/Text/HTML.php | 2 +- src/Protocol/DFRN.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/api.php b/include/api.php index e4d059c1ea..0f7fa85bdd 100644 --- 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 8b309e79a4..6e3bd571b3 100644 --- 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( '#]+>(.*?)https?://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+)(.*?)#ism', diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 4cf7c7b731..8a2b21745d 100644 --- 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']);