Merge branch 'develop' into abi_refactor

Conflicts: dist/web3-light.js.map dist/web3-light.min.js dist/web3.js.map dist/web3.min.js
web3 · Apr 20, 2015 · a46b9ea · a46b9ea
2 parents 779a608 + 677bb68
commit a46b9ea
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/web3/formatters.js b/lib/web3/formatters.js
@@ -160,7 +160,7 @@ var inputPostFormatter = function(post) {
 
     // fallback
     if (!utils.isArray(post.topics)) {
-        post.topics = [post.topics];
+        post.topics = post.topics ? [post.topics] : [];
     }
 
     // format the following options
@@ -192,6 +192,9 @@ var outputPostFormatter = function(post){
     }
 
     // format the following options
+    if (!post.topics) {
+        post.topics = [];
+    }
     post.topics = post.topics.map(function(topic){
         return utils.toAscii(topic);
     });