From 5652447de042c729a7841e7b9099ea6711cf6304 Mon Sep 17 00:00:00 2001
From: Tetrakern <26898880+Tetrakern@users.noreply.github.com>
Date: Wed, 28 Aug 2024 15:13:07 +0200
Subject: [PATCH] Add fictioneer_get_theme_cache_uri()

---
 INSTALLATION.md                     |  1 -
 functions.php                       |  5 ----
 includes/functions/_setup-theme.php | 36 +++++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/INSTALLATION.md b/INSTALLATION.md
index 37ea6ebf..3aa94703 100644
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -1568,7 +1568,6 @@ define( 'CONSTANT_NAME', value );
 | FICTIONEER_TRUNCATION_ELLIPSIS | string | Appended to truncated strings. Default `…`.
 | FICTIONEER_AGE_CONFIRMATION_REDIRECT | string | Redirect URL if a visitor reject the age confirmation. Default `https://search.brave.com/`.
 | FICTIONEER_CACHE_DIR | string | Server path to the theme cache directory.
-| FICTIONEER_CACHE_URL | string | URL to the theme cache directory.
 | FICTIONEER_COMMENTCODE_TTL | integer | How long guests can see their private/unapproved comments in _seconds_. Default `600`.
 | FICTIONEER_AJAX_TTL | integer | How long to cache certain AJAX requests locally in _milliseconds_. Default `60000`.
 | FICTIONEER_AJAX_LOGIN_TTL | integer | How long to cache AJAX authentications locally in _milliseconds_. Default `15000`.
diff --git a/functions.php b/functions.php
index dea4d1a5..7199e507 100644
--- a/functions.php
+++ b/functions.php
@@ -135,11 +135,6 @@ if ( ! defined( 'FICTIONEER_CACHE_DIR' ) ) {
   define( 'FICTIONEER_CACHE_DIR', WP_CONTENT_DIR . '/themes/fictioneer/cache' );
 }
 
-// String: Path to cache URL (without trailing slash)
-if ( ! defined( 'FICTIONEER_CACHE_URL' ) ) {
-  define( 'FICTIONEER_CACHE_URL', WP_CONTENT_URL . '/themes/fictioneer/cache' );
-}
-
 /*
  * Date Strings
  */
diff --git a/includes/functions/_setup-theme.php b/includes/functions/_setup-theme.php
index 494df99a..71188a48 100644
--- a/includes/functions/_setup-theme.php
+++ b/includes/functions/_setup-theme.php
@@ -1,5 +1,27 @@
 <?php
 
+// =============================================================================
+// URI HELPERS
+// =============================================================================
+
+/**
+ * Returns URI to the theme cache
+ *
+ * @since 5.23.1
+ *
+ * @param string|null $context  The context of the call. Default null.
+ *
+ * @return string URI to the theme cache.
+ */
+
+function fictioneer_get_theme_cache_uri( $context = null ) {
+  return apply_filters(
+    'fictioneer_filter_cache_uri',
+    get_template_directory_uri() . '/cache',
+    $context
+  );
+}
+
 // =============================================================================
 // LEGACY CLEANUP
 // =============================================================================
@@ -947,7 +969,7 @@ function fictioneer_output_customize_css() {
   if ( file_exists( $file_path ) ) {
     wp_enqueue_style(
       'fictioneer-customize',
-      FICTIONEER_CACHE_URL . "/customize.css",
+      fictioneer_get_theme_cache_uri() . "/customize.css",
       get_option( 'fictioneer_bundle_stylesheets' ) ? ['fictioneer-complete'] : ['fictioneer-application'],
       fictioneer_get_cache_bust()
     );
@@ -975,7 +997,7 @@ function fictioneer_output_customize_preview_css() {
   if ( file_exists( $file_path ) ) {
     wp_enqueue_style(
       'fictioneer-customize',
-      FICTIONEER_CACHE_URL . "/customize-preview.css",
+      fictioneer_get_theme_cache_uri() . "/customize-preview.css",
       ['fictioneer-application'],
       time() // Prevents caching in preview
     );
@@ -1140,7 +1162,13 @@ function fictioneer_add_custom_scripts() {
   // Dynamic scripts
   fictioneer_build_dynamic_scripts();
 
-  wp_register_script( 'fictioneer-dynamic-scripts', FICTIONEER_CACHE_URL . '/dynamic-scripts.js', [], $cache_bust, $strategy );
+  wp_register_script(
+    'fictioneer-dynamic-scripts',
+    fictioneer_get_theme_cache_uri() . '/dynamic-scripts.js',
+    [],
+    $cache_bust,
+    $strategy
+  );
 
   // Register and enqueue single scripts or complete script
   if ( ! get_option( 'fictioneer_bundle_scripts' ) ) {
@@ -1528,7 +1556,7 @@ if ( ! function_exists( 'fictioneer_output_head_fonts' ) ) {
     // Output font stylesheets...
     if ( file_exists( $bundled_fonts ) ) {
       // ... base and custom
-      $custom_fonts_href = FICTIONEER_CACHE_URL . '/bundled-fonts.css' . $cache_bust;
+      $custom_fonts_href = fictioneer_get_theme_cache_uri() . '/bundled-fonts.css' . $cache_bust;
 
       // Start HTML ---> ?>
       <link rel="stylesheet" id="fictioneer-bundled-fonts-stylesheet" href="<?php echo $custom_fonts_href; ?>" data-no-optimize="1" data-no-minify="1" <?php echo $loading_pattern; ?>>