Revert moving template files into a theme subfolder

Having template files in a subfolder can lead to unexpected consequences, as we can see in timber/timber#2458. There may be other effects. Working around them is more tedious than the benefits a subfolder brings.
timber · Mar 14, 2023 · 1823e4d · 1823e4d
1 parent b1946c5
commit 1823e4d
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 3 deletions.
diff --git a/theme/404.php → 404.php b/theme/404.php → 404.php
diff --git a/theme/archive.php → archive.php b/theme/archive.php → archive.php
diff --git a/theme/author.php → author.php b/theme/author.php → author.php
diff --git a/theme/footer.php → footer.php b/theme/footer.php → footer.php
diff --git a/theme/functions.php → functions.php b/theme/functions.php → functions.php
@@ -13,7 +13,7 @@
  * to load your dependencies and initialize Timber. If you are using Timber via the WordPress.org
  * plug-in, you can safely delete this block.
  */
-$composer_autoload = dirname( __DIR__ ) . '/vendor/autoload.php';
+$composer_autoload = __DIR__ . '/vendor/autoload.php';
 if ( file_exists( $composer_autoload ) ) {
 	require_once $composer_autoload;
 	Timber\Timber::init();
@@ -35,7 +35,7 @@ function() {
 	add_filter(
 		'template_include',
 		function( $template ) {
-			return dirname( get_stylesheet_directory() ) . '/static/no-timber.html';
+			return get_stylesheet_directory() . '/static/no-timber.html';
 		}
 	);
 	return;

diff --git a/theme/header.php → header.php b/theme/header.php → header.php
diff --git a/theme/index.php → index.php b/theme/index.php → index.php
diff --git a/theme/page.php → page.php b/theme/page.php → page.php
diff --git a/theme/screenshot.png → screenshot.png b/theme/screenshot.png → screenshot.png
diff --git a/theme/search.php → search.php b/theme/search.php → search.php
diff --git a/theme/sidebar.php → sidebar.php b/theme/sidebar.php → sidebar.php
diff --git a/theme/single.php → single.php b/theme/single.php → single.php
diff --git a/theme/style.css → style.css b/theme/style.css → style.css
diff --git a/tests/test-timber-starter-theme.php b/tests/test-timber-starter-theme.php
@@ -5,7 +5,7 @@ class TestTimberStarterTheme extends \WorDBless\BaseTestCase {
 	function setUp() {
 		self::_setupStarterTheme();
 		switch_theme( basename( dirname( __DIR__ ) ) . '/theme' );
-		require_once dirname( __DIR__ ) . '/theme/functions.php';
+		require_once dirname( __DIR__ ) . '/functions.php';
 		// WorDBless includes wp-settings.php
 		do_action( 'after_setup_theme' );
 	}