Merge pull request #236 from Twansparant/ajax-relative-urls

Add ajax support for relative urls module
roots · Dec 7, 2019 · 4e60b4e · 4e60b4e
2 parents 794226e + e60e1b0
commit 4e60b4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/relative-urls.php b/modules/relative-urls.php
@@ -14,7 +14,7 @@
  * add_theme_support('soil-relative-urls');
  */
 
-if (is_admin() || isset($_GET['sitemap']) || in_array($GLOBALS['pagenow'], ['wp-login.php', 'wp-register.php'])) {
+if ((is_admin() && !wp_doing_ajax()) || isset($_GET['sitemap']) || in_array($GLOBALS['pagenow'], ['wp-login.php', 'wp-register.php'])) {
   return;
 }
 

diff --git a/soil.php b/soil.php
@@ -55,8 +55,8 @@ public function set($options) {
 function load_modules() {
   global $_wp_theme_features;
 
-  // Skip loading modules in the admin.
-  if (is_admin()) {
+  // Skip loading modules in the admin but allow in ajax actions.
+  if ((is_admin() && !wp_doing_ajax())) {
     return;
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
      * add_theme_support('soil-relative-urls');
      */
-    if (is_admin() || isset($_GET['sitemap']) || in_array($GLOBALS['pagenow'], ['wp-login.php', 'wp-register.php'])) {
+    if ((is_admin() && !wp_doing_ajax()) || isset($_GET['sitemap']) || in_array($GLOBALS['pagenow'], ['wp-login.php', 'wp-register.php'])) {
       return;
     }
@@ Expand Down @@