From: skodak Date: Thu, 6 Jul 2006 15:53:46 +0000 (+0000) Subject: Bug #5820 - IE returns unsecure items with SSL on login; merged from MOODLE_16_STABLE X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=10ab3efc35592ee7cde0af207ea944d5bf8d438e;p=moodle.git Bug #5820 - IE returns unsecure items with SSL on login; merged from MOODLE_16_STABLE --- diff --git a/theme/cornflower/header.html b/theme/cornflower/header.html index 95997bf50b..2461dfe3b3 100644 --- a/theme/cornflower/header.html +++ b/theme/cornflower/header.html @@ -8,7 +8,7 @@ javascript"); ?> - - +
@@ -44,7 +44,7 @@
- +
@@ -64,7 +64,7 @@
-
+
diff --git a/theme/formal_white/header.html b/theme/formal_white/header.html index e57fee1b58..7ab4d12bda 100644 --- a/theme/formal_white/header.html +++ b/theme/formal_white/header.html @@ -21,13 +21,13 @@ if ($home) { // This is what gets printed on the home page only ?>
-

Moodle/logo.jpg' />

+

Moodle/logo.jpg' />

diff --git a/theme/standardlogo/header.html b/theme/standardlogo/header.html index 06311a5c9f..df9836c89c 100644 --- a/theme/standardlogo/header.html +++ b/theme/standardlogo/header.html @@ -19,23 +19,23 @@ dirroot.'/logo.jpg')) { - $standardlogo = $CFG->wwwroot.'/logo.jpg'; + $standardlogo = $CFG->httpswwwroot.'/logo.jpg'; } else if (file_exists($CFG->dirroot.'/logo.gif')) { - $standardlogo = $CFG->wwwroot.'/logo.gif'; + $standardlogo = $CFG->httpswwwroot.'/logo.gif'; } else if (file_exists($CFG->dataroot.'/1/logo.jpg')) { if (empty($CFG->slasharguments)) { - $standardlogo = $CFG->wwwroot.'/file.php?file=/1/logo.jpg'; + $standardlogo = $CFG->httpswwwroot.'/file.php?file=/1/logo.jpg'; } else { - $standardlogo = $CFG->wwwroot.'/file.php/1/logo.jpg'; + $standardlogo = $CFG->httpswwwroot.'/file.php/1/logo.jpg'; } } else if (file_exists($CFG->dataroot.'/1/logo.gif')) { if (empty($CFG->slasharguments)) { - $standardlogo = $CFG->wwwroot.'/file.php?file=/1/logo.gif'; + $standardlogo = $CFG->httpswwwroot.'/file.php?file=/1/logo.gif'; } else { - $standardlogo = $CFG->wwwroot.'/file.php/1/logo.gif'; + $standardlogo = $CFG->httpswwwroot.'/file.php/1/logo.gif'; } } else { - $standardlogo = $CFG->wwwroot.'/theme/'.current_theme().'/logo.gif'; + $standardlogo = $CFG->httpswwwroot.'/theme/'.current_theme().'/logo.gif'; } //Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1.