From: mjollnir_ <mjollnir_>
Date: Mon, 9 Apr 2007 20:40:22 +0000 (+0000)
Subject: Merged from MOODLE_17_STABLE:
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=64aea3f0556e1dcf85268163c1e69b9de51999e0;p=moodle.git

Merged from MOODLE_17_STABLE:

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>
---

diff --git a/lib/editor/htmlarea/popups/fullscreen.php b/lib/editor/htmlarea/popups/fullscreen.php
index a85fb9bfc5..721810f887 100644
--- a/lib/editor/htmlarea/popups/fullscreen.php
+++ b/lib/editor/htmlarea/popups/fullscreen.php
@@ -29,7 +29,7 @@ for (var i = 0; i < scripts.length; ++i) {
     // 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;