From e36f3098f852ff9136df47ddc726cafdfd5284ed Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Thu, 14 Jul 2005 22:36:40 +0000
Subject: [PATCH] Core changes finished. Now javascripts URLs support
 HTTPSPAGEREQUIRED properly. Ready to start protecting pages.

Merged from MOODLE_15_STABLE
---
 lib/javascript.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/javascript.php b/lib/javascript.php
index e6e1d7ad728..f7488c57789 100644
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -6,15 +6,15 @@
     }
 
     if(!empty($CFG->aspellpath)) {      // Enable global access to spelling feature.
-        echo '<script language="JavaScript" type="text/javascript" src="'.$CFG->wwwroot.'/lib/speller/spellChecker.js"></script>'."\n";
+        echo '<script language="JavaScript" type="text/javascript" src="'.$CFG->httpswwwroot.'/lib/speller/spellChecker.js"></script>'."\n";
     }
 ?>
-<!--<style type="text/css">/*<![CDATA[*/ body{behavior:url(<?php echo $CFG->wwwroot ?>/lib/csshover.htc);} /*]]>*/</style>-->
+<!--<style type="text/css">/*<![CDATA[*/ body{behavior:url(<?php echo $CFG->httpswwwroot ?>/lib/csshover.htc);} /*]]>*/</style>-->
 
-<script language="JavaScript" type="text/javascript" src="<?php echo $CFG->wwwroot ?>/lib/javascript-static.js"></script>
-<script language="JavaScript" type="text/javascript" src="<?php echo $CFG->wwwroot ?>/lib/javascript-mod.php"></script>
-<script language="JavaScript" type="text/javascript" src="<?php echo $CFG->wwwroot ?>/lib/overlib.js"></script>
-<script language="JavaScript" type="text/javascript" src="<?php echo $CFG->wwwroot ?>/lib/cookies.js"></script>
+<script language="JavaScript" type="text/javascript" src="<?php echo $CFG->httpswwwroot ?>/lib/javascript-static.js"></script>
+<script language="JavaScript" type="text/javascript" src="<?php echo $CFG->httpswwwroot ?>/lib/javascript-mod.php"></script>
+<script language="JavaScript" type="text/javascript" src="<?php echo $CFG->httpswwwroot ?>/lib/overlib.js"></script>
+<script language="JavaScript" type="text/javascript" src="<?php echo $CFG->httpswwwroot ?>/lib/cookies.js"></script>
 
 <script language="JavaScript" type="text/javascript" defer="defer">
 
@@ -23,7 +23,7 @@
 setTimeout('fix_column_widths()', 20);
 
 function openpopup(url,name,options,fullscreen) {
-  fullurl = "<?php echo $CFG->wwwroot ?>" + url;
+  fullurl = "<?php echo $CFG->httpswwwroot ?>" + url;
   windowobj = window.open(fullurl,name,options);
   if (fullscreen) {
      windowobj.moveTo(0,0);