Changeset 332168

Timestamp:

01/13/2011 05:17:51 PM (15 years ago)

Author:

dphiffer

Message:

Fixed a bug with the exclude query param

File:

• json-api/trunk/singletons/response.php (modified) (2 diffs)

json-api/trunk/singletons/response.php

@@ -6 +6 @@
     global $json_api;
     $this->include_values = array();
+    $this->exclude_values = array();
     if ($json_api->query->include) {
       $this->include_values = explode(',', $json_api->query->include);
     }
+    // Props to ikesyo for submitting a fix!
     if ($json_api->query->exclude) {
-      $exclude = explode(',', $json_api->query->exclude);
-      $this->include_values = array_diff($this->include_values, $exclude);
+      $this->exclude_values = explode(',', $json_api->query->exclude);
+      $this->include_values = array_diff($this->include_values, $this->exclude_values);
     }
     
@@ -44 +46 @@
   
   function is_value_included($key) {
-    if (empty($this->include_values)) {
+    // Props to ikesyo for submitting a fix!
+    if (empty($this->include_values) && empty($this->exclude_values)) {
       return true;
     } else {
-      return in_array($key, $this->include_values);
+      if (empty($this->exclude_values)) {
+        return in_array($key, $this->include_values);
+      } else {
+        return !in_array($key, $this->exclude_values);
+      }
     }
   }