fix settings single collection response

directus · Sep 21, 2016 · eb9e6c3 · eb9e6c3
1 parent b153948
commit eb9e6c3
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/api/api.php b/api/api.php
@@ -1207,9 +1207,11 @@
             break;
     }
 
-    $settings_new = $Settings->fetchAll();
-    // $get_new = is_null($id) ? $settings_new : $settings_new[$id];
-    $response = array_key_exists($id, $settings_new) ? $settings_new : null;
+    $response = $Settings->fetchAll();
+    if (!is_null($id)) {
+        $response = array_key_exists($id, $response) ? $response[$id] : null;
+    }
+
     if (!$response) {
         $response = [
             'message' => __t('unable_to_find_setting_collection_x', ['collection' => $id]),