MDL-12668 - Various themes not respecting theme varaibles

merged from MOODLE_19_STABLE

diff --git a/theme/chameleon/meta.php b/theme/chameleon/meta.php
index 23caf6c9250fbc0049e2f82ada6cd5463cfc0e09..ebb731cfff7fb726b5b4c08b54f2f0e859d1461d 100644 (file)
--- a/theme/chameleon/meta.php
+++ b/theme/chameleon/meta.php
@@ -1,6 +1,6 @@
 <!--[if IE 7]>
-    <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpswwwroot ?>/theme/chameleon/styles_ie7.css" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpsthemewww ?>/chameleon/styles_ie7.css" />
 <![endif]-->
 <!--[if IE 6]>
-    <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpswwwroot ?>/theme/chameleon/styles_ie6.css" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpsthemewww ?>/chameleon/styles_ie6.css" />
 <![endif]-->

diff --git a/theme/cornflower/header.html b/theme/cornflower/header.html
index d67804131a6bf4aa5fee175ab5617dfd3bb51be5..74383a45299839d2ad960cfa83fbccc5d594cab0 100644 (file)
--- a/theme/cornflower/header.html
+++ b/theme/cornflower/header.html
@@ -4,7 +4,7 @@
     <?php echo $meta ?>
     <meta name="keywords" content="moodle, <?php echo $title ?> " />
     <title><?php echo $title ?></title>
-    <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
+    <link rel="shortcut icon" href="<?php echo $CFG->themewww.'/'.current_theme() ?>/favicon.ico" />
     <?php include("$CFG->javascript"); ?>
 </head>
 
@@ -21,13 +21,13 @@
 
       if ($home) {  // home page ?>
     <?php print_container_start(true, '', 'header-home'); ?>
-        <h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1>
+        <h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->themewww.'/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     <?php print_container_end(); ?>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading
 ?>
     <?php print_container_start(true, '', 'header'); ?>
-        <h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1>
+        <h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->themewww.'/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     <?php print_container_end(); ?>
     <div class="clearer"></div>

diff --git a/theme/standard/meta.php b/theme/standard/meta.php
index ba50b86ad4ab690075c40103bb91e3493d9b055e..a333f1998b2ee2800d02db65e2eb2853003c635d 100644 (file)
--- a/theme/standard/meta.php
+++ b/theme/standard/meta.php
@@ -1,6 +1,6 @@
 <!--[if IE 7]>
-    <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpswwwroot ?>/theme/standard/styles_ie7.css" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpsthemewww ?>/standard/styles_ie7.css" />
 <![endif]-->
 <!--[if IE 6]>
-    <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpswwwroot ?>/theme/standard/styles_ie6.css" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpsthemewww ?>/standard/styles_ie6.css" />
 <![endif]-->