navigation MDL-20833 Moved has_navbar from OUTPUT to PAGE as it is logic

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 2bfe56be4b3dfcd60e5d7702972ff4e8d003ac58..04e2264f654fc0740f6d8fd7d4d6ba4a092267ec 100644 (file)
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -742,7 +742,7 @@ class moodle_core_renderer extends moodle_renderer_base {
         $COURSE = $this->page->course;
 
         // Required for legacy template uses
-        $navigation = $this->has_navbar();
+        $navigation = $this->page->has_navbar();
 
         ob_start();
         include($templatefile);
@@ -789,7 +789,7 @@ class moodle_core_renderer extends moodle_renderer_base {
         $course = $this->page->course;
         $performanceinfo = self::PERFORMANCE_INFO_TOKEN;
 
-        $navigation = $this->has_navbar();
+        $navigation = $this->page->has_navbar();
         if (!$menu && $navigation) {
             $menu = $loggedinas;
         }
@@ -2373,15 +2373,7 @@ class moodle_core_renderer extends moodle_renderer_base {
     public function navbar() {
         return $this->page->navbar->content();
     }
-
-    /**
-     * Checks to see if there are any items on the navbar object
-     * @return bool true if there are, false if not
-     */
-    public function has_navbar() {
-        return $this->page->navbar->has_items();
     }
-}
 
 
 /// RENDERERS

diff --git a/lib/pagelib.php b/lib/pagelib.php
index 4cba5a38e1dda72aae844927acb9a14ae18337c1..a6316560449dfb009db43abbf4efeee4cfdf0170 100644 (file)
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -475,6 +475,17 @@ class moodle_page {
         return $this->_navbar;
     }
 
+    /**
+     * Checks to see if there are any items on the navbar object
+     * @return bool true if there are, false if not
+     */
+    public function has_navbar() {
+        if ($this->_navbar === null) {
+            $this->_navbar = new navbar($this);
+        }
+        return $this->_navbar->has_items();
+    }
+
     /**
      * Returns the settings navigation object
      * @return settings_navigation

diff --git a/theme/standard/layout-popup.php b/theme/standard/layout-popup.php
index 9089fcb32c0655da6527bce40ffedf06aec4a929..8eaf1d9be3c292a2b59c858ef929ea5c6e2a1d7b 100644 (file)
--- a/theme/standard/layout-popup.php
+++ b/theme/standard/layout-popup.php
@@ -17,7 +17,7 @@
     </div>
 <?php } ?>
 
-<?php if ($OUTPUT->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
+<?php if ($PAGE->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
     <div class="navbar clearfix">
         <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
         <div class="navbutton"><?php echo $PAGE->button; ?></div>

diff --git a/theme/standard/layout-topframe.php b/theme/standard/layout-topframe.php
index 9089fcb32c0655da6527bce40ffedf06aec4a929..8eaf1d9be3c292a2b59c858ef929ea5c6e2a1d7b 100644 (file)
--- a/theme/standard/layout-topframe.php
+++ b/theme/standard/layout-topframe.php
@@ -17,7 +17,7 @@
     </div>
 <?php } ?>
 
-<?php if ($OUTPUT->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
+<?php if ($PAGE->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
     <div class="navbar clearfix">
         <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
         <div class="navbutton"><?php echo $PAGE->button; ?></div>

diff --git a/theme/standard/layout.php b/theme/standard/layout.php
index d328d110a9d8bdf03b282ac7cfd8f0fba9359c83..c379ee32bcccadd99a932e25b1fa108c0277a412 100644 (file)
--- a/theme/standard/layout.php
+++ b/theme/standard/layout.php
@@ -17,7 +17,7 @@
     </div>
 <?php } ?>
 
-<?php if ($OUTPUT->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
+<?php if ($PAGE->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
     <div class="navbar clearfix">
         <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
         <div class="navbutton"><?php echo $PAGE->button; ?></div>