updated ACF Image Support

This is an update to #123 - credits to @laneparton

I've only changed the bootstrapping of the ACF relevant part to be
fired after the theme is loaded - in case ACF is loaded within the
theme.

src/ACF/Image.php

@@ -21,6 +21,11 @@ class Image
      */
     private $siteSwitcher;
 
+    /**
+     * @var \ACF_Data
+     */
+    private $store;
+
     /**
      * Image constructor
      *

src/Plugin.php

@@ -59,15 +59,13 @@ public function onLoad()
 
         add_filter('register_post_type_args', [$rest, 'registerPostTypeArgs'], 10, 2);
         add_filter('rest_request_after_callbacks', [$rest, 'restRequestAfterCallbacks'], 10, 3);
-        
+
 
         if (\function_exists('wc')) {
             $this->wcBootstrap($site, $singleSwitcher);
         }
 
-        if (\function_exists('acf')) {
-            $this->acfBootstrap($site, $singleSwitcher);
-        }
+        $this->acfBootstrap($site, $singleSwitcher);
     }
 
     /**
@@ -92,8 +90,13 @@ public function wcBootstrap(Site $site, SingleSwitcher $siteSwitcher)
      */
     public function acfBootstrap(Site $site, SingleSwitcher $siteSwitcher)
     {
-        $acfImage = new ACF\Image($site, $siteSwitcher);
-
-        add_filter('acf/load_value/type=image', array($acfImage, 'acfLoadValue'), 10, 3);
+        // ACF can be included within a theme too - check in after_setup_theme action
+        // https://www.advancedcustomfields.com/resources/including-acf-within-a-plugin-or-theme/
+        add_action('after_setup_theme', function() use ($site, $siteSwitcher) {
+            if (\function_exists('get_field')) {
+                $acfImage = new ACF\Image($site, $siteSwitcher);
+                add_filter('acf/load_value/type=image', array($acfImage, 'acfLoadValue'), 10, 3);
+            }
+        });
     }
 }