'
// translators: reading time in min.
diff --git a/src/PublicAssets.php b/src/PublicAssets.php
index 4ed099ec7a..27d2be5138 100644
--- a/src/PublicAssets.php
+++ b/src/PublicAssets.php
@@ -14,6 +14,10 @@ final class PublicAssets
*/
public static function enqueue_js(): void
{
+ if (!file_exists(get_template_directory() . '/assets/build/index.js')) {
+ return;
+ }
+
$js_creation = filectime(get_template_directory() . '/assets/build/index.js');
$theme_dir = get_template_directory_uri();
diff --git a/src/Search/SearchPage.php b/src/Search/SearchPage.php
index cb62b44905..3fc5dc9ce4 100644
--- a/src/Search/SearchPage.php
+++ b/src/Search/SearchPage.php
@@ -32,7 +32,7 @@ public function __construct(WP_Query $query)
{
$this->query = $query;
$this->posts = $query->posts;
- $this->context = Timber::get_context();
+ $this->context = Timber::context();
$this->populate_context($query);
}
diff --git a/src/TimberSettings.php b/src/TimberSettings.php
new file mode 100644
index 0000000000..8fca5ddb12
--- /dev/null
+++ b/src/TimberSettings.php
@@ -0,0 +1,39 @@
+ Post::class,
+ 'post' => Post::class,
+ //'tag' => Post::class,
+ 'campaign' => Post::class,
+ 'p4-page-type' => Post::class,
+ ];
+
+ return array_merge($classmap, $custom_classmap);
+ });
+
+ add_filter('timber/user/class', fn() => User::class);
+
+ add_filter('timber/twig/environment/options', static function (array $options): array {
+ $options['autoescape'] = 'html';
+ $options['cache'] = defined('WP_DEBUG') ? !WP_DEBUG : true;
+ return $options;
+ });
+
+ add_filter('timber/locations', static function (array $locations): array {
+ $locations['enform'] = [
+ dirname(__DIR__) . '/templates/block_templates',
+ dirname(__DIR__) . '/templates/block_templates/enform',
+ ];
+ return $locations;
+ });
+ }
+}
diff --git a/src/User.php b/src/User.php
index 6a7fad3cef..6a946cb9f8 100644
--- a/src/User.php
+++ b/src/User.php
@@ -17,20 +17,10 @@ class User extends Timber\User
*/
public bool $is_fake = false;
- /**
- * User constructor.
- *
- * @param object|int|bool $uid The User id.
- * @param string $author_override The author override display name.
- */
- public function __construct($uid = false, string $author_override = '')
+ public static function build(\WP_User $wp_user): self
{
- if (! $author_override) {
- parent::__construct($uid);
- } else {
- $this->display_name = $author_override;
- $this->is_fake = true;
- }
+ $user = parent::build($wp_user);
+ return $user;
}
/**
diff --git a/src/View/View.php b/src/View/View.php
index be5c21ff7b..44cdeece0e 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -41,8 +41,6 @@ public function get_template(
array $data,
string $relevant_dir = 'block_templates/'
): bool|string {
- Timber::$locations = $this->get_template_dir($template_name, $relevant_dir);
-
return Timber::compile([$relevant_dir . $template_name . '.twig'], $data);
}
@@ -61,8 +59,6 @@ public function view_template(
string $relevant_dir = '',
bool $compile = false
): string|null {
- Timber::$locations = $this->get_template_dir($template_name, $relevant_dir);
-
if ($compile) {
return Timber::compile([$relevant_dir . $template_name . '.twig'], $data);
}
@@ -123,7 +119,6 @@ public function block(
): void {
$template_dir = $this->get_template_dir($template_name, $relevant_dir, $template_ext);
if ('twig' === $template_ext) {
- Timber::$locations = $template_dir;
Timber::render([$relevant_dir . $template_name . '.' . $template_ext], $data);
} else {
include_once $template_dir . $relevant_dir . $template_name . '.' . $template_ext;
diff --git a/tag.php b/tag.php
index 1ff53597bf..a97d8a444b 100644
--- a/tag.php
+++ b/tag.php
@@ -11,7 +11,6 @@
*/
use P4\MasterTheme\Context;
-use P4\MasterTheme\Post;
use P4\MasterTheme\ListingPage;
use Timber\Timber;
@@ -35,10 +34,10 @@
exit();
}
-$post = Timber::query_post(false, Post::class); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-$context = Timber::get_context();
+$post = Timber::get_post(false); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+$context = Timber::context();
if ($post instanceof \WP_Post) {
- $post = new Post($post->ID);
+ $post = Timber::get_post($post->ID);
Context::set_og_meta_fields($context, $post);
}
diff --git a/taxonomy.php b/taxonomy.php
index 96d9683621..336193c43b 100755
--- a/taxonomy.php
+++ b/taxonomy.php
@@ -12,7 +12,7 @@
$templates = [ 'taxonomy.twig', 'index.twig' ];
-$context = Timber::get_context();
+$context = Timber::context();
$taxonomy = get_queried_object();
$context['taxonomy'] = $taxonomy;
diff --git a/templates/author.twig b/templates/author.twig
index d0a92fb21a..6b49f652e9 100644
--- a/templates/author.twig
+++ b/templates/author.twig
@@ -12,7 +12,7 @@
{% if ( author.description ) %}
-
{{ fn('wpautop', fn('the_author_meta', 'description', author.id))|e('wp_kses_post')|raw }}
+
{{ fn('wpautop', author.description)|e('wp_kses_post')|raw }}
{% endif %}