Merge branch 'master' into develop

goshen · Oct 11, 2011 · 0d21ae6 · 0d21ae6
2 parents 18829e1 + a578bea
commit 0d21ae6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/controller.js b/lib/controller.js
@@ -269,8 +269,8 @@ Controller.prototype.render = function (arg1, arg2) {
         params = arg1;
     }
     params = params || {};
-    params.controller = params.controller || this.controllerFullName;
-    params.action = params.action || this.actionName;
+    params.controllerName = params.controllerName || this.controllerFullName;
+    params.actionName = params.actionName || this.actionName;
     params.path_to = this.path_to;
     params.request = this.request;
     params.t = this.t;