Merge branch 'MDL-35754-master' of git://github.com/FMCorz/moodle

2012-10-03 10:26:14 +08:00
parent b478f2ec10 df435dda49
commit fcdd35d0fc
1 changed files with 5 additions and 2 deletions
@@ -1212,9 +1212,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()');