Merge pull request #1912 from kaisermann/title-on-controller

Moved title() helper to app.php controller
roots · Aug 17, 2017 · e00eaf7 · e00eaf7
2 parents 6022309 + 0283131
commit e00eaf7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 25 deletions.
diff --git a/app/helpers.php b/app/helpers.php
@@ -125,27 +125,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
@@ -10,4 +10,24 @@ public function siteName()
     {
         return get_bloginfo('name');
     }
+
+    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
@@ -1,3 +1,3 @@
 <div class="page-header">
-  <h1>{!! App\title() !!}</h1>
+  <h1>{!! App::title() !!}</h1>
 </div>