From c500b415364084ceb1d2c597e5499b25c3638621 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Mon, 11 Aug 2014 11:50:44 +0100
Subject: [PATCH] Filestorage helper returns string true if config is object

no issue

- else admin client gets [object Object] which is weird Please enter the commit message for your changes. Lines starting
---
 core/server/helpers/index.js                |  2 +-
 core/test/unit/server_helpers_index_spec.js | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/server/helpers/index.js b/core/server/helpers/index.js
index 6523bbf418..f0f4453137 100644
--- a/core/server/helpers/index.js
+++ b/core/server/helpers/index.js
@@ -355,7 +355,7 @@ coreHelpers.excerpt = function (options) {
 coreHelpers.file_storage = function (context, options) {
     /*jshint unused:false*/
     if (config.hasOwnProperty('fileStorage')) {
-        return config.fileStorage.toString();
+        return _.isObject(config.fileStorage) ? 'true' : config.fileStorage.toString();
     }
     return 'true';
 };
diff --git a/core/test/unit/server_helpers_index_spec.js b/core/test/unit/server_helpers_index_spec.js
index e560cf6a1d..f17481e272 100644
--- a/core/test/unit/server_helpers_index_spec.js
+++ b/core/test/unit/server_helpers_index_spec.js
@@ -1754,6 +1754,21 @@ describe('Core Helpers', function () {
             should.exist(fileStorage);
             fileStorage.should.equal(setting);
         });
+
+        it('should just return true if config.fileStorage is an object', function () {
+            var setting = {someKey: 'someValue'},
+                cfg = helpers.__get__('config'),
+                fileStorage;
+
+            _.extend(cfg, {
+                fileStorage: setting
+            });
+
+            fileStorage = helpers.file_storage();
+
+            should.exist(fileStorage);
+            fileStorage.should.equal('true');
+        });
     });
 
     describe('apps helper', function () {