Merge branch 'MDL-35754-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

2012-10-03 10:26:22 +08:00
parent a8d7f5cf15 1e5b1d6dad
commit aaed6d7800
1 changed files with 5 additions and 2 deletions
@@ -1190,9 +1190,12 @@ function openpopup(event, args) {
        }
    }

-    // Cleans window name because IE does not support funky ones.
+    // Make sure the name argument is set and valid.
    var nameregex = /[^a-z0-9_]/i;
-    if (args.name.match(nameregex)) {
+    if (typeof args.name !== 'string') {
+        args.name = '_blank';
+    } else if (args.name.match(nameregex)) {
+        // Cleans window name because IE does not support funky ones.
        args.name = args.name.replace(nameregex, '_');
        if (M.cfg.developerdebug) {
            alert('DEVELOPER NOTICE: Invalid \'name\' passed to openpopup()');