Bug #4315 - Use current_theme() instead of the $CFG-theme

diff --git a/theme/cornflower/footer.html b/theme/cornflower/footer.html
index f516a6ef8ad8a3828075cb552065294375aacf14..acacf9a2fec0e3765b03292beec7fa5e1b28e1df 100644 (file)
--- a/theme/cornflower/footer.html
+++ b/theme/cornflower/footer.html
@@ -10,7 +10,7 @@
 ?>\r
 \r
 <?php echo $loggedinas ?>\r
-<p align="center"><a href="http://moodle.org" target="_blank"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme/images/moodlelogo.gif" ?>" border="0"></a></p>\r
+<p align="center"><a href="http://moodle.org" target="_blank"><img src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/moodlelogo.gif" border="0" /></a></p>\r
 \r
 </div>\r
 </div>\r

diff --git a/theme/orangewhite/footer.html b/theme/orangewhite/footer.html
index c390f02c2b272c6da36634881d37f32ed5f7c762..e05faac6df89a69cac103e82738a7e7e88b8c2a4 100644 (file)
--- a/theme/orangewhite/footer.html
+++ b/theme/orangewhite/footer.html
@@ -1,7 +1,7 @@
 
 </div> <!-- end div containerContent -->
 <!-- START OF FOOTER -->
-<?php global $CFG, $course; ?>
+
 <div id="footer">
 <?php
     echo '<p class="helplink">';
@@ -11,12 +11,7 @@
 
 <?php echo $loggedinas ?>
 <?php echo $homelink ?>
-<!-- <p><div class="homelink"><a target="<?php echo $CFG->framename ?>" href="<?php $CFG->wwwroot ?>/course/view.php?id=<?php $course->id ?>"> <?php $course->shortname ?> </a></div></p> -->
-<p>
-<!-- <<a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/xhtml_1_0.gif" alt="XHTML Validator" /></a>
-<a href="http://jigsaw.w3.org/css-validator/validator?uri=<?php echo urlencode(qualified_me()) ?>&amp;warning=1&amp;profile=css2&amp;usermedium=all"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/css.gif" alt="CSS Validator" /></a> 
-<a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/section_508.gif" alt="Section 508 Validator" /></a> -->
-</p>
+
 </div>
 </div>
 </body>

diff --git a/theme/orangewhitepda/footer.html b/theme/orangewhitepda/footer.html
index 45d64a65c126837de986e120a9bf3ee0ccf0ed87..e05faac6df89a69cac103e82738a7e7e88b8c2a4 100644 (file)
--- a/theme/orangewhitepda/footer.html
+++ b/theme/orangewhitepda/footer.html
@@ -1,21 +1,17 @@
 
 </div> <!-- end div containerContent -->
 <!-- START OF FOOTER -->
-<?php global $CFG, $course; ?>
+
 <div id="footer">
 <?php
     echo '<p class="helplink">';
     echo page_doc_link(get_string('moodledocslink'));
     echo '</p>';
 ?>
+
 <?php echo $loggedinas ?>
 <?php echo $homelink ?>
-<!-- <p><div class="homelink"><a target="<?php echo $CFG->framename ?>" href="<?php $CFG->wwwroot ?>/course/view.php?id=<?php $course->id ?>"> <?php $course->shortname ?> </a></div></p> -->
-<p>
-<!-- <<a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/xhtml_1_0.gif" alt="XHTML Validator" /></a>
-<a href="http://jigsaw.w3.org/css-validator/validator?uri=<?php echo urlencode(qualified_me()) ?>&amp;warning=1&amp;profile=css2&amp;usermedium=all"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/css.gif" alt="CSS Validator" /></a> 
-<a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/section_508.gif" alt="Section 508 Validator" /></a> -->
-</p>
+
 </div>
 </div>
 </body>

diff --git a/theme/orangewhitepda/header.html b/theme/orangewhitepda/header.html
index ac33f882e3e83f5d93818fb7320619aa7c72236d..89d94d0817756471debe587d993b354974f954fa 100644 (file)
--- a/theme/orangewhitepda/header.html
+++ b/theme/orangewhitepda/header.html
@@ -13,7 +13,7 @@
     if ($focus) {
         echo " onload=\"setfocus()\"";
     };
-    ?>
+    ?>>
     
 <div id="page">
 
@@ -41,4 +41,4 @@
     </div>
 <?php } ?>
     <!-- END OF HEADER -->
-<div id="content">
\ No newline at end of file
+<div id="content">