From c12c0c541dec18f76e3b95477ba7246cb55b19df Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 25 Nov 2024 15:55:30 +0900 Subject: [PATCH 1/3] Update http string check --- app/helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers.php b/app/helpers.php index 78fe78e85c2..5ce62768169 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1116,7 +1116,7 @@ function proxy_media($url) } // turn relative urls into absolute urls - if (!preg_match('/^https?\:\/\//', $url)) { + if (!is_http($url)) { // ensure url is relative to the site root if ($url[0] !== '/') { $url = "/{$url}"; From d0b1e536071cf60ee45739bacf1ab24563b3bb5a Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 25 Nov 2024 15:58:46 +0900 Subject: [PATCH 2/3] Don't html entity decode proxy media urls I think it was originally for bbcode urls but it's also done in the parser now so it's kinda redundant. --- app/helpers.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/helpers.php b/app/helpers.php index 5ce62768169..f3163eca4f1 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1103,8 +1103,6 @@ function proxy_media($url) return ''; } - $url = html_entity_decode_better($url); - if ($GLOBALS['cfg']['osu']['camo']['key'] === null) { return $url; } From 5a91417a9150c4eed0def9f77d03d75e159b8288 Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 25 Nov 2024 16:06:19 +0900 Subject: [PATCH 3/3] Use native php version --- app/helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers.php b/app/helpers.php index f3163eca4f1..9389b36a309 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1107,7 +1107,7 @@ function proxy_media($url) return $url; } - $isProxied = starts_with($url, $GLOBALS['cfg']['osu']['camo']['prefix']); + $isProxied = str_starts_with($url, $GLOBALS['cfg']['osu']['camo']['prefix']); if ($isProxied) { return $url;