Merge branch 'master' of github.com:zohararad/sails-rest

zohararad · Apr 9, 2016 · 1dfd143 · 1dfd143
2 parents 3a4f393 + 81e1d41
commit 1dfd143
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -31,8 +31,8 @@ module.exports.connections = {
     adapter: 'sails-rest',
     host:     'localhost:8080',  // api host
     protocol: 'http',            // api HTTP protocol
-    pathname: ''                 // api endpoint path name
-    headers:  {},                // Optional HTTP headers    
+    pathname: '',                // api endpoint path name
+    headers:  {},                // Optional HTTP headers
     hooks: {
       merge:    true,            // flag that indicates whether or not to merge build-in hooks with user-provided hooks
       before:   [],              // array of hook functions that run before a request

diff --git a/lib/connection.js b/lib/connection.js
@@ -133,7 +133,7 @@ Connection.find = function (connection, collection, options, cb) {
       }
       // Waterline requires that `find` will return an array.
       // Here we ensure that response body is converted to an array if required.
-      if(!err && !_.isEmpty(res.body)){
+      if(!err){
         if(!Array.isArray(res.body)){
           res.body = [res.body];
         }