Merge pull request #7 from catgofire/patch-1

Update for new Sage 10 directory structure
MWDelaney · Feb 1, 2021 · 96d2129 · 96d2129
2 parents ea7e0a0 + c88b4cb
commit 96d2129
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/advanced-custom-fields.php b/advanced-custom-fields.php
@@ -24,9 +24,15 @@
         if (is_dir(get_stylesheet_directory() . '/assets')) {
             // This is Sage 9
             $path = get_stylesheet_directory() . '/assets/acf-json';
-        } else {
-            // This is Sage 10
+        } elseif (is_dir(get_stylesheet_directory() . '/resources/assets')) {
+            // This is old Sage 10
             $path = get_stylesheet_directory() . '/resources/assets/acf-json';
+        } elseif (is_dir(get_stylesheet_directory() . '/resources')) {
+            // This is Sage 10
+            $path = get_stylesheet_directory() . '/resources/acf-json';
+        } else {
+            // This probably isn't Sage
+            $path = get_stylesheet_directory() . '/acf-json';
         }
 
         // If the directory doesn't exist, create it.
@@ -48,9 +54,15 @@
         // Sage 9 path
         $paths[] = get_stylesheet_directory() . '/assets/acf-json';
 
-        // Sage 10 path
+        // old Sage 10 path
         $paths[] = get_stylesheet_directory() . '/resources/assets/acf-json';
 
+        // Sage 10 path
+        $paths[] = get_stylesheet_directory() . '/resources/acf-json';
+
+        // Failsafe path
+        $paths[] = get_stylesheet_directory() . '/acf-json';
+
         // return
         return $paths;
     });