From d956e54c853e8dc871b71339480059edd3afcb5b Mon Sep 17 00:00:00 2001 From: Christian Kaisermann Date: Fri, 23 Jun 2017 13:03:35 -0300 Subject: [PATCH 1/2] Moved title() helper to app.php controller --- app/helpers.php | 24 ------------------- resources/controllers/App.php | 24 +++++++++++++++++++ .../views/partials/page-header.blade.php | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/helpers.php b/app/helpers.php index b56c162ddb..139f311508 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -87,27 +87,3 @@ function display_sidebar() isset($display) || $display = apply_filters('sage/display_sidebar', false); return $display; } - -/** - * Page titles - * @return string - */ -function title() -{ - if (is_home()) { - if ($home = get_option('page_for_posts', true)) { - return get_the_title($home); - } - return __('Latest Posts', 'sage'); - } - if (is_archive()) { - return get_the_archive_title(); - } - if (is_search()) { - return sprintf(__('Search Results for %s', 'sage'), get_search_query()); - } - if (is_404()) { - return __('Not Found', 'sage'); - } - return get_the_title(); -} diff --git a/resources/controllers/App.php b/resources/controllers/App.php index 128ae3483e..01f88d9607 100644 --- a/resources/controllers/App.php +++ b/resources/controllers/App.php @@ -10,4 +10,28 @@ public function siteName() { return get_bloginfo('name'); } + + /** + * Page titles + * @return string + */ + public static function title() + { + if (is_home()) { + if ($home = get_option('page_for_posts', true)) { + return get_the_title($home); + } + return __('Latest Posts', 'sage'); + } + if (is_archive()) { + return get_the_archive_title(); + } + if (is_search()) { + return sprintf(__('Search Results for %s', 'sage'), get_search_query()); + } + if (is_404()) { + return __('Not Found', 'sage'); + } + return get_the_title(); + } } diff --git a/resources/views/partials/page-header.blade.php b/resources/views/partials/page-header.blade.php index e60521fcdf..b50b56c8cd 100644 --- a/resources/views/partials/page-header.blade.php +++ b/resources/views/partials/page-header.blade.php @@ -1,3 +1,3 @@ From 0283131d001143ca4f8a23245a76c23c233d78f0 Mon Sep 17 00:00:00 2001 From: Christian Kaisermann Date: Wed, 5 Jul 2017 11:37:06 -0300 Subject: [PATCH 2/2] Removed comment --- resources/controllers/App.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/controllers/App.php b/resources/controllers/App.php index 01f88d9607..c9c7d737cb 100644 --- a/resources/controllers/App.php +++ b/resources/controllers/App.php @@ -11,10 +11,6 @@ public function siteName() return get_bloginfo('name'); } - /** - * Page titles - * @return string - */ public static function title() { if (is_home()) {