Init vars with a value if none is provided

diff --git a/core/js/js.js b/core/js/js.js
index 60f9cc11a581293dcabbfd4748142419fa8de84e..2f02ccd04a88546bfaa1865a19b572509f4acdb5 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -234,6 +234,7 @@ var OC={
         */
        generateUrl: function(url, params) {
                var _build = function (text, vars) {
+                       var vars = vars || [];
                        return text.replace(/{([^{}]*)}/g,
                                function (a, b) {
                                        var r = vars[b];

diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 166210d0312296ee45c6c82e33b1d7d812a9364c..3af56c490e65e455196d2e133dce699970ec4f37 100644 (file)
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -376,6 +376,9 @@ describe('Core base tests', function() {
                it('substitutes parameters', function() {
                        expect(OC.generateUrl('apps/files/download{file}', {file: '/Welcome.txt'})).toEqual(OC.webroot + '/index.php/apps/files/download/Welcome.txt');
                });
+               it('doesnt error out with no params provided', function  () {
+                       expect(OC.generateUrl('apps/files/download{file}')).toEqual(OC.webroot + '/index.php/apps/files/download{file}');
+               });
        });
        describe('Main menu mobile toggle', function() {
                var clock;