Fixes jashkenas#1736 -- Underscore templates no longer accept a data argument -- just settings.

Author: jashkenas

test/utility.js

@@ -271,7 +271,8 @@
   test('_.templateSettings.variable', function() {
     var s = '<%=data.x%>';
     var data = {x: 'x'};
-    strictEqual(_.template(s, data, {variable: 'data'}), 'x');
+    var tmp = _.template(s, {variable: 'data'});
+    strictEqual(tmp(data), 'x');
     _.templateSettings.variable = 'data';
     strictEqual(_.template(s)(data), 'x');
   });

underscore.js

@@ -1283,7 +1283,9 @@
   // JavaScript micro-templating, similar to John Resig's implementation.
   // Underscore templating handles arbitrary delimiters, preserves whitespace,
   // and correctly escapes quotes within interpolated code.
-  _.template = function(text, data, settings) {
+  // NB: `oldSettings` only exists for backwards compatibility.
+  _.template = function(text, settings, oldSettings) {
+    if (!settings && oldSettings) settings = oldSettings;
     settings = _.defaults({}, settings, _.templateSettings);
 
     // Combine delimiters into one regular expression via alternation.
@@ -1327,7 +1329,6 @@
       throw e;
     }
 
-    if (data) return render(data, _);
     var template = function(data) {
       return render.call(this, data, _);
     };