Theme activation updates 'stylesheet' option instead of 'template'

QWp6t · QWp6t · commit fb19145d4236 · 2016-11-07T00:57:41.000-08:00
diff --git a/functions.php b/functions.php
@@ -20,22 +20,21 @@
  * We do this so that the Template Hierarchy will look in themes/sage/templates for core WordPress themes
  * But functions.php, style.css, and index.php are all still located in themes/sage
  *
- * themes/sage/index.php also contains some self-correcting code, just in case the template option gets reset
+ * get_template_directory()   -> /srv/www/example.com/current/web/app/themes/sage
+ * get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage
+ * locate_template()
+ * ├── STYLESHEETPATH         -> /srv/www/example.com/current/web/app/themes/sage
+ * └── TEMPLATEPATH           -> /srv/www/example.com/current/web/app/themes/sage/templates
  */
-add_filter('stylesheet', function ($stylesheet) {
+add_filter('template', function ($stylesheet) {
     return dirname($stylesheet);
 });
 add_action('after_switch_theme', function () {
-    $stylesheet = get_option('stylesheet');
+    $stylesheet = get_option('template');
     if (basename($stylesheet) !== 'templates') {
-        update_option('stylesheet', $stylesheet . '/templates');
+        update_option('template', $stylesheet . '/templates');
     }
 });
-add_action('customize_render_section', function ($section) {
-    if ($section->type === 'themes') {
-        $section->title = wp_get_theme(basename(__DIR__))->display('Name');
-    }
-}, 10, 2);
 
 /**
  * Sage includes
diff --git a/index.php b/index.php
@@ -1,6 +1,3 @@
 <?php
 
-if (defined('ABSPATH')) {
-    update_option('template', get_option('template') . '/templates');
-}
-die("Kind Regards,\nRoots");
+include __DIR__ . '/templates/index.php';
diff --git a/src/helpers.php b/src/helpers.php
@@ -24,7 +24,7 @@ function template_part($template, array $context = [], $layout = 'base')
 function asset_path($filename)
 {
     static $manifest;
-    isset($manifest) || $manifest = new JsonManifest(get_template_directory() . '/' . Asset::$dist . '/assets.json');
+    isset($manifest) || $manifest = new JsonManifest(get_stylesheet_directory() . '/' . Asset::$dist . '/assets.json');
     return (string) new Asset($filename, $manifest);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ function template_part($template, array $context = [], $layout = 'base')`
`24`	`24`	`function asset_path($filename)`
`25`	`25`	`{`
`26`	`26`	`static $manifest;`
`27`		`- isset($manifest) \|\| $manifest = new JsonManifest(get_template_directory() . '/' . Asset::$dist . '/assets.json');`
	`27`	`+ isset($manifest) \|\| $manifest = new JsonManifest(get_stylesheet_directory() . '/' . Asset::$dist . '/assets.json');`
`28`	`28`	`return (string) new Asset($filename, $manifest);`
`29`	`29`	`}`
`30`	`30`