From b3ced51ae9dfdc61161974ad3fa82d82cdc6a3af Mon Sep 17 00:00:00 2001 From: mateuszurbanowicz Date: Tue, 24 Nov 2015 16:25:27 +0100 Subject: [PATCH 1/3] replace onfig with option --- app/Http/Controllers/HomeController.php | 2 +- resources/views/emails/auth/welcome.blade.php | 2 +- resources/views/emails/layouts/default.blade.php | 6 +++--- resources/views/includes/head.blade.php | 4 ++-- resources/views/includes/navbar.blade.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c03d7c14..97f7ace3 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -46,7 +46,7 @@ public function index(Request $request) ['isSticky', 'DESC'] ], $request->get('page', 1), - config('gzero.defaultPageSize', 20) + option('general', 'defaultPageSize', false, 20) ); $contents->setPath($request->url()); diff --git a/resources/views/emails/auth/welcome.blade.php b/resources/views/emails/auth/welcome.blade.php index 93dff006..a9a0d4a3 100644 --- a/resources/views/emails/auth/welcome.blade.php +++ b/resources/views/emails/auth/welcome.blade.php @@ -4,6 +4,6 @@

@lang('emails.welcome.title')

- @lang('emails.welcome.body', ["siteName" => config('gzero.siteName'), "domain" => config('gzero.domain')]) + @lang('emails.welcome.body', ["siteName" => option('general', 'siteName'), "domain" => config('gzero.domain')])

@stop diff --git a/resources/views/emails/layouts/default.blade.php b/resources/views/emails/layouts/default.blade.php index 9d3fbaf0..ba9866c7 100644 --- a/resources/views/emails/layouts/default.blade.php +++ b/resources/views/emails/layouts/default.blade.php @@ -4,7 +4,7 @@ - {{ config('gzero.siteName') }} + {{ option('general', 'siteName') }}