diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b1c3ac3f..ef3c8f23 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,7 +2,6 @@ namespace App\Providers; -use App\Exceptions\PrettyPageException; use App\Services; use Illuminate\Http\Request; use Illuminate\Support\Facades\Redis; diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php index 782e344b..636babe1 100644 --- a/app/Providers/ViewServiceProvider.php +++ b/app/Providers/ViewServiceProvider.php @@ -49,16 +49,11 @@ class ViewServiceProvider extends ServiceProvider View::composer('shared.user-panel', Composers\UserPanelComposer::class); View::composer('shared.copyright', function ($view) { - $customCopyright = get_string_replaced( - option_localized('copyright_text'), - [ - '{site_name}' => option_localized('site_name'), - '{site_url}' => option('site_url'), - ] - ); $view->with([ 'copyright' => option_localized('copyright_prefer', 0), - 'custom_copyright' => $customCopyright, + 'custom_copyright' => option_localized('copyright_text'), + 'site_name' => option_localized('site_name'), + 'site_url' => option('site_url'), ]); }); diff --git a/app/helpers.php b/app/helpers.php index 67c5d3e7..0068690e 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -83,20 +83,6 @@ if (!function_exists('option_localized')) { } } -if (!function_exists('get_string_replaced')) { - /** - * Replace content of string according to given rules. - */ - function get_string_replaced(string $str, array $rules): string - { - foreach ($rules as $search => $replace) { - $str = str_replace($search, $replace, $str); - } - - return $str; - } -} - if (!function_exists('png')) { function png($resource) { diff --git a/resources/views/shared/copyright.twig b/resources/views/shared/copyright.twig index a8b4e4ec..e206647b 100644 --- a/resources/views/shared/copyright.twig +++ b/resources/views/shared/copyright.twig @@ -15,4 +15,5 @@ {% endif %} -{{ custom_copyright|raw }} +{% set rules = {'{site_name}': site_name, '{site_url}': site_url} %} +{{ custom_copyright|replace(rules)|raw }}