Skip to content

Commit

Permalink
Merged from MOODLE_17_STABLE:
Browse files Browse the repository at this point in the history
add support for https source for popups

previously fullscreen.php tried to load any javascript files that were
running in the popup's parent.
If the source of the script didn't start with "http:" it was assumed
that it must be a relative path. This caused problems when it tried to
make it into an absolute path.
Fixed Regex to include support for https
Credit: Peter Bulmer <peterb@catalyst.net.nz>
  • Loading branch information
mjollnir_ committed Apr 9, 2007
1 parent 315184a commit 9076a56
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/editor/htmlarea/popups/fullscreen.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
// document.write("<scr" + "ipt type=" + "\"script/javascript\"");
// document.write(" src=\"../" + script.src + "\"></scr" + "ipt>");
var new_script = document.createElement("script");
if (/^http:/i.test(script.src)) {
if (/^https?:/i.test(script.src)) {
new_script.src = script.src;
} else {
new_script.src = "../" + script.src;
Expand Down

0 comments on commit 9076a56

Please sign in to comment.