Merge pull request #91 from sserbin/defer-services-json-inclusion

Defer Services_Json inclusion/initialization until really needed
campaignmonitor · Jul 31, 2019 · d8ae5ba · d8ae5ba
2 parents 3002903 + 288adf3
commit d8ae5ba
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/class/serialisation.php b/class/serialisation.php
@@ -1,9 +1,5 @@
 <?php
 
-if (!class_exists('Services_JSON', false)) {
-    require_once dirname(__FILE__).'/services_json.php';
-}
-
 if(!function_exists("CS_REST_SERIALISATION_get_available")) {
     function CS_REST_SERIALISATION_get_available($log) { 
         $log->log_message('Getting serialiser', __FUNCTION__, CS_REST_LOG_VERBOSE);
@@ -107,6 +103,10 @@ class CS_REST_ServicesJsonSerialiser extends CS_REST_BaseSerialiser {
 
         function __construct($log) {
             parent::__construct($log);
+            if (!class_exists('Services_JSON', false)) {
+                require_once dirname(__FILE__).'/services_json.php';
+            }
+
             $this->_serialiser = new Services_JSON();
         }