diff --git a/lodash.js b/lodash.js index 3a8d038f0..711020039 100644 --- a/lodash.js +++ b/lodash.js @@ -8473,12 +8473,13 @@ // http://ejohn.org/blog/javascript-micro-templating/ // and Laura Doktorova's doT.js // https://github.com/olado/doT + var settings = lodash.templateSettings; + if (isIterateeCall(string, options, otherOptions)) { options = otherOptions = null; } - var settings = lodash.templateSettings; - options = assign({}, otherOptions || options, settings, assignOwnDefaults); string = String(string == null ? '' : string); + options = assign({}, otherOptions || options, settings, assignOwnDefaults); var imports = assign({}, options.imports, settings.imports, assignOwnDefaults), importsKeys = keys(imports),