fix($resource): prevent default params to be shared between actions

Having a $resource defined as:

var R = $resource('/Path', {}, {
  get: {method: 'GET', params: {objId: '1'}},
  perform: {method: 'GET'}
});

was causing both actions to call the same URI (if called in this order):

R.get({}); // => /Path?objId=1
R.perform({}); // => /Path?objId=1

1 files changed, 2 insertions, 2 deletions

diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
index ab5dc52a..db86eb41 100644
--- a/src/ngResource/resource.js
+++ b/src/ngResource/resource.js
@@ -314,8 +314,8 @@ angular.module('ngResource', ['ng']).
 
       function extractParams(data, actionParams){
         var ids = {};
-        paramDefaults = extend(paramDefaults, actionParams);
-        forEach(paramDefaults || {}, function(value, key){
+        actionParams = extend({}, paramDefaults, actionParams);
+        forEach(actionParams, function(value, key){
           ids[key] = value.charAt && value.charAt(0) == '@' ? getter(data, value.substr(1)) : value;
         });
         return ids;