From 6da5094cb4aa9e5ac5bda655cdbd1bf1751006cd Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 7 Apr 2019 08:54:54 +0800 Subject: [PATCH] Remove `get_base_url` function --- app/helpers.php | 15 +-------------- resources/views/skinlib/show.blade.php | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app/helpers.php b/app/helpers.php index aa556078..902cffc1 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -5,24 +5,11 @@ use App\Models\User; use Illuminate\Support\Arr; use Illuminate\Support\Str; -if (! function_exists('get_base_url')) { - function get_base_url() - { - $base_url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://'; - $base_url .= $_SERVER['SERVER_NAME']; - $base_url .= ($_SERVER['SERVER_PORT'] == '80') ? '' : (':'.$_SERVER['SERVER_PORT']); - - return $base_url; - } -} - if (! function_exists('webpack_assets')) { function webpack_assets($relativeUri) { if (app()->environment('development')) { - // @codeCoverageIgnoreStart - return "http://127.0.0.1:8080/$relativeUri"; - // @codeCoverageIgnoreEnd + return "http://127.0.0.1:8080/$relativeUri"; // @codeCoverageIgnore } else { $path = app('webpack')->$relativeUri; $cdn = option('cdn_address'); diff --git a/resources/views/skinlib/show.blade.php b/resources/views/skinlib/show.blade.php index 95381cef..2085dd62 100644 --- a/resources/views/skinlib/show.blade.php +++ b/resources/views/skinlib/show.blade.php @@ -28,7 +28,7 @@ {!! get_string_replaced(option('comment_script'), [ '{tid}' => $texture->tid, '{name}' => $texture->name, - '{url}' => get_base_url().$_SERVER['REQUEST_URI'] + '{url}' => request()->url() ]) !!}