Merge branch 'hotfix-data_utils'

Indicia-Team · Feb 16, 2022 · 76e483e · 76e483e
2 parents 7d8eaee + 3c6ddab
commit 76e483e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -29,15 +29,15 @@
  *
  * @var string
  */
-$config['version'] = '6.12.18';
+$config['version'] = '6.12.19';
 
 
 /**
  * Version release date.
  *
  * @var string
  */
-$config['release_date'] = '2022-02-15';
+$config['release_date'] = '2022-02-16';
 
 
 /**

diff --git a/modules/indicia_svc_data/controllers/services/data_utils.php b/modules/indicia_svc_data/controllers/services/data_utils.php
@@ -87,7 +87,16 @@ public function __call($name, $arguments) {
         }
       }
       $params = implode(', ', $action['parameters']);
-      echo json_encode($db->query("select $action[stored_procedure]($params);")->result_array(TRUE));
+      $r = json_encode($db->query("select $action[stored_procedure]($params);")->result_array(TRUE));
+      // Enable JSONP.
+      if (array_key_exists('callback', $_REQUEST)) {
+        $r = "$_REQUEST[callback]($r)";
+        header('Content-Type: application/javascript');
+      }
+      else {
+        header('Content-Type: application/json');
+      }
+      echo $r;
       if (class_exists('request_logging')) {
         request_logging::log('a', 'data', 'data_utils', $name, $this->website_id, $this->user_id, $tm, $db);
       }