theme MDL-19824 Upgraded deprecated calls

diff --git a/theme/chameleon/ui/chameleon.php b/theme/chameleon/ui/chameleon.php
index 1bb782ee8791bbc3df3a44b30e9b943deb1ade1e..195bee7d05d54e285ae678c5c0dfaa9f2aeb80d0 100644 (file)
--- a/theme/chameleon/ui/chameleon.php
+++ b/theme/chameleon/ui/chameleon.php
@@ -14,7 +14,7 @@ if (!empty($THEME->chameleonenabled)) {
     if ($chameleon_isadmin or ($chameleon_isteacher and !empty($CFG->allowcoursethemes) and !empty($THEME->chameleonteachereditenabled))) { 
         // either we're an admin or we're a teacher and this is being used as the course theme
         // if we're on a page using a course theme edit that, otherwise edit the main chameleon theme
-        $chameleon_theme = current_theme();
+        $chameleon_theme = $PAGE->theme->name;
 ?>
 
 <style type="text/css"> @import '<?php echo "$CFG->themewww/$chameleon_theme" ?>/ui/chameleon_ui.css'; </style>

diff --git a/theme/standard/layout-popup.php b/theme/standard/layout-popup.php
index 49fdb2b802a839c048f9f9cbe1109fc2faa4f0a6..9089fcb32c0655da6527bce40ffedf06aec4a929 100644 (file)
--- a/theme/standard/layout-popup.php
+++ b/theme/standard/layout-popup.php
@@ -17,9 +17,9 @@
     </div>
 <?php } ?>
 
-<?php if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
+<?php if ($OUTPUT->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
     <div class="navbar clearfix">
-        <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
+        <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
         <div class="navbutton"><?php echo $PAGE->button; ?></div>
     </div>
 <?php } else if ($PAGE->heading) { // If no navigation, but a heading, then print a line ?>

diff --git a/theme/standard/layout-topframe.php b/theme/standard/layout-topframe.php
index 49fdb2b802a839c048f9f9cbe1109fc2faa4f0a6..9089fcb32c0655da6527bce40ffedf06aec4a929 100644 (file)
--- a/theme/standard/layout-topframe.php
+++ b/theme/standard/layout-topframe.php
@@ -17,9 +17,9 @@
     </div>
 <?php } ?>
 
-<?php if ($navigation) { // This is the navigation bar with breadcrumbs  ?>
+<?php if ($OUTPUT->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
     <div class="navbar clearfix">
-        <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
+        <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
         <div class="navbutton"><?php echo $PAGE->button; ?></div>
     </div>
 <?php } else if ($PAGE->heading) { // If no navigation, but a heading, then print a line ?>