From 911446c03ec92be4d08674d83e004968f6392ca8 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 12 Mar 2024 06:42:12 -0600 Subject: [PATCH] Update app.name config, use config_cache --- app/Http/Controllers/Api/ApiV1Controller.php | 2 +- resources/views/account/moderation/post/autospam.blade.php | 4 ++-- resources/views/account/moderation/post/cw.blade.php | 4 ++-- resources/views/account/moderation/post/removed.blade.php | 4 ++-- resources/views/account/moderation/post/unlist.blade.php | 4 ++-- resources/views/home.blade.php | 4 ++-- resources/views/layouts/app-guest.blade.php | 6 +++--- resources/views/layouts/app.blade.php | 4 ++-- resources/views/layouts/blank.blade.php | 4 ++-- resources/views/layouts/bundle.blade.php | 6 +++--- resources/views/layouts/partial/noauthnav.blade.php | 2 +- resources/views/portfolio/layout.blade.php | 4 ++-- resources/views/profile/embed-removed.blade.php | 4 ++-- resources/views/profile/embed.blade.php | 4 ++-- resources/views/profile/private.blade.php | 2 +- resources/views/site/index.blade.php | 2 +- resources/views/status/embed-removed.blade.php | 4 ++-- resources/views/vendor/mail/html/message.blade.php | 4 ++-- resources/views/vendor/mail/text/message.blade.php | 4 ++-- resources/views/vendor/passport/authorize.blade.php | 2 +- 20 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index cdb488ab4..313890c28 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -1632,7 +1632,7 @@ class ApiV1Controller extends Controller return [ 'uri' => config('pixelfed.domain.app'), - 'title' => config('app.name'), + 'title' => config_cache('app.name'), 'short_description' => config_cache('app.short_description'), 'description' => config_cache('app.description'), 'email' => config('instance.email'), diff --git a/resources/views/account/moderation/post/autospam.blade.php b/resources/views/account/moderation/post/autospam.blade.php index 91296759d..d16d85f3e 100644 --- a/resources/views/account/moderation/post/autospam.blade.php +++ b/resources/views/account/moderation/post/autospam.blade.php @@ -69,7 +69,7 @@

Review the Community Guidelines

-

We want to keep {{config('app.name')}} a safe place for everyone, and we created these Community Guidelines to support and protect our community.

+

We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these Community Guidelines to support and protect our community.

@@ -100,4 +100,4 @@ ctx.putImageData(imageData, 0, 0); @endif -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/account/moderation/post/cw.blade.php b/resources/views/account/moderation/post/cw.blade.php index d1e1d3537..bffa7a186 100644 --- a/resources/views/account/moderation/post/cw.blade.php +++ b/resources/views/account/moderation/post/cw.blade.php @@ -70,7 +70,7 @@

Review the Community Guidelines

-

We want to keep {{config('app.name')}} a safe place for everyone, and we created these Community Guidelines to support and protect our community.

+

We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these Community Guidelines to support and protect our community.

@@ -127,4 +127,4 @@ ctx.putImageData(imageData, 0, 0); @endif -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/account/moderation/post/removed.blade.php b/resources/views/account/moderation/post/removed.blade.php index 123863489..4b8a1fee4 100644 --- a/resources/views/account/moderation/post/removed.blade.php +++ b/resources/views/account/moderation/post/removed.blade.php @@ -62,7 +62,7 @@

Review the Community Guidelines

-

We want to keep {{config('app.name')}} a safe place for everyone, and we created these Community Guidelines to support and protect our community.

+

We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these Community Guidelines to support and protect our community.

@@ -96,4 +96,4 @@ ctx.putImageData(imageData, 0, 0); @endif -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/account/moderation/post/unlist.blade.php b/resources/views/account/moderation/post/unlist.blade.php index 3c86acb76..4f62a10bb 100644 --- a/resources/views/account/moderation/post/unlist.blade.php +++ b/resources/views/account/moderation/post/unlist.blade.php @@ -69,7 +69,7 @@

Review the Community Guidelines

-

We want to keep {{config('app.name')}} a safe place for everyone, and we created these Community Guidelines to support and protect our community.

+

We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these Community Guidelines to support and protect our community.

@@ -125,4 +125,4 @@ ctx.putImageData(imageData, 0, 0); @endif -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 2f7b05cd3..e5aed6dad 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app',['title' => 'Welcome to ' . config('app.name')]) +@extends('layouts.app',['title' => 'Welcome to ' . config_cache('app.name')]) @section('content')
@@ -14,7 +14,7 @@
@endif -

Welcome to {{config('app.name')}}!

+

Welcome to {{config_cache('app.name')}}!

diff --git a/resources/views/layouts/app-guest.blade.php b/resources/views/layouts/app-guest.blade.php index 6adcffac4..7d8dbd201 100644 --- a/resources/views/layouts/app-guest.blade.php +++ b/resources/views/layouts/app-guest.blade.php @@ -5,11 +5,11 @@ - {{ $title ?? config('app.name', 'Pixelfed') }} + {{ $title ?? config_cache('app.name', 'Pixelfed') }} - - + + @stack('meta') diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 0136842bb..168992aaf 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -70,11 +70,11 @@ - {{ $title ?? config('app.name', 'Pixelfed') }} + {{ $title ?? config_cache('app.name', 'Pixelfed') }} - + @stack('meta') diff --git a/resources/views/layouts/blank.blade.php b/resources/views/layouts/blank.blade.php index 00042315d..deaf71d62 100644 --- a/resources/views/layouts/blank.blade.php +++ b/resources/views/layouts/blank.blade.php @@ -11,8 +11,8 @@ {{ $title ?? config_cache('app.name') }} - - + + @stack('meta') diff --git a/resources/views/layouts/bundle.blade.php b/resources/views/layouts/bundle.blade.php index 1050a39d6..94e0c2c00 100644 --- a/resources/views/layouts/bundle.blade.php +++ b/resources/views/layouts/bundle.blade.php @@ -9,11 +9,11 @@ - {{ $title ?? config('app.name', 'Laravel') }} + {{ $title ?? config_cache('app.name', 'Pixelfed') }} - - + + @stack('meta') diff --git a/resources/views/layouts/partial/noauthnav.blade.php b/resources/views/layouts/partial/noauthnav.blade.php index 465b51354..004c8497f 100644 --- a/resources/views/layouts/partial/noauthnav.blade.php +++ b/resources/views/layouts/partial/noauthnav.blade.php @@ -2,7 +2,7 @@
Pixelfed logo - {{ config('app.name', 'Laravel') }} + {{ config_cache('app.name', 'Pixelfed') }}
diff --git a/resources/views/portfolio/layout.blade.php b/resources/views/portfolio/layout.blade.php index 14158fb37..89e909284 100644 --- a/resources/views/portfolio/layout.blade.php +++ b/resources/views/portfolio/layout.blade.php @@ -11,8 +11,8 @@ {!! $title ?? config_cache('app.name') !!} - - + + @stack('meta') diff --git a/resources/views/profile/embed-removed.blade.php b/resources/views/profile/embed-removed.blade.php index 7a49d2e79..c236eb790 100644 --- a/resources/views/profile/embed-removed.blade.php +++ b/resources/views/profile/embed-removed.blade.php @@ -9,8 +9,8 @@ Pixelfed | 404 Embed Not Found - - + + diff --git a/resources/views/profile/embed.blade.php b/resources/views/profile/embed.blade.php index cc6097e3a..aeb6a5b99 100644 --- a/resources/views/profile/embed.blade.php +++ b/resources/views/profile/embed.blade.php @@ -9,8 +9,8 @@ {{ $title ?? config('app.name', 'Pixelfed') }} - - + + diff --git a/resources/views/profile/private.blade.php b/resources/views/profile/private.blade.php index ffff37d49..118ef643e 100644 --- a/resources/views/profile/private.blade.php +++ b/resources/views/profile/private.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app-guest',['title' => $user->username . " on " . config('app.name')]) +@extends('layouts.app-guest',['title' => $user->username . " on " . config_cache('app.name')]) @section('content') @if (session('error')) diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php index e6753a727..b7d3befaa 100644 --- a/resources/views/site/index.blade.php +++ b/resources/views/site/index.blade.php @@ -8,7 +8,7 @@ - {{ config('app.name', 'Pixelfed') }} + {{ config_cache('app.name', 'Pixelfed') }} diff --git a/resources/views/status/embed-removed.blade.php b/resources/views/status/embed-removed.blade.php index e5f94525b..b9f0a2df6 100644 --- a/resources/views/status/embed-removed.blade.php +++ b/resources/views/status/embed-removed.blade.php @@ -9,8 +9,8 @@ Pixelfed | 404 Embed Not Found - - + + diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php index deec4a1f4..26c1f7d80 100644 --- a/resources/views/vendor/mail/html/message.blade.php +++ b/resources/views/vendor/mail/html/message.blade.php @@ -2,7 +2,7 @@ {{-- Header --}} @slot('header') @component('mail::header', ['url' => config('app.url')]) -{{ config('app.name') }} +{{ config_cache('app.name') }} @endcomponent @endslot @@ -21,7 +21,7 @@ {{-- Footer --}} @slot('footer') @component('mail::footer') -© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') +© {{ date('Y') }} {{ config_cache('app.name') }}. @lang('All rights reserved.') @endcomponent @endslot @endcomponent diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php index 1ae9ed8f1..3416a9bd4 100644 --- a/resources/views/vendor/mail/text/message.blade.php +++ b/resources/views/vendor/mail/text/message.blade.php @@ -2,7 +2,7 @@ {{-- Header --}} @slot('header') @component('mail::header', ['url' => config('app.url')]) - {{ config('app.name') }} + {{ config_cache('app.name') }} @endcomponent @endslot @@ -21,7 +21,7 @@ {{-- Footer --}} @slot('footer') @component('mail::footer') - © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') + © {{ date('Y') }} {{ config_cache('app.name') }}. @lang('All rights reserved.') @endcomponent @endslot @endcomponent diff --git a/resources/views/vendor/passport/authorize.blade.php b/resources/views/vendor/passport/authorize.blade.php index 986f76801..a644289ca 100644 --- a/resources/views/vendor/passport/authorize.blade.php +++ b/resources/views/vendor/passport/authorize.blade.php @@ -4,7 +4,7 @@ - {{ config('app.name') }} - Authorization + {{ config_cache('app.name') }} - Authorization