From d4159e1ea45bfe1b6ee720cf0af6b32a29046df9 Mon Sep 17 00:00:00 2001 From: Bart van Eijck Date: Thu, 27 Aug 2015 08:52:17 +0200 Subject: [PATCH] 0.6.5 --- HISTORY.md | 4 ++++ lib/util.js | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 7829177..78e9626 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,7 @@ +0.6.5 / 2015-08-27 +================== + * Fixed a bug in `util.merge()` + 0.6.4 / 2015-07-09 ================== * Prevent `JSON.parse()` crash when the Discogs API returns HTML instead of json (maintainance mode) diff --git a/lib/util.js b/lib/util.js index 4c918df..def0670 100644 --- a/lib/util.js +++ b/lib/util.js @@ -51,7 +51,7 @@ util.escape = function(str){ * @returns {object} */ -util.merge = function(target, source){ +util.merge = function merge(target, source){ for(var key in source){ if(source[key] && (typeof source[key] === 'object')){ target[key] = merge((Array.isArray(source[key]) ? [] : {}), source[key]); diff --git a/package.json b/package.json index 5219598..559c954 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "disconnect", "description": "A full featured Discogs API v2.0 client library", - "version": "0.6.4", + "version": "0.6.5", "keywords": ["discogs", "api", "client", "oauth"], "homepage": "https://github.com/bartve/disconnect", "bugs": "https://github.com/bartve/disconnect/issues",