From: samhemelryk <samhemelryk>
Date: Wed, 23 Sep 2009 06:24:14 +0000 (+0000)
Subject: navigation MDL-20324 Quick fix to a regression caused by last update
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=dfca6e9968d2b7f647876ed085cfaf2288cb40fe;p=moodle.git

navigation MDL-20324 Quick fix to a regression caused by last update
---

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index f904b33712..4e3b4a73b1 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -380,7 +380,7 @@ class navigation_node {
      * @return string The HTML content
      */
     public function content($shorttext=false) {
-        global $OUTPUT, $CFG;
+        global $OUTPUT, $CFG, $PAGE;
         if (!$this->display) {
             return '';
         }
@@ -409,7 +409,7 @@ class navigation_node {
                 $link->add_class('dimmed');
             }
 
-            if (!empty($CFG->framename)) {
+            if (!empty($CFG->framename) && $PAGE->generaltype=='topframe') {
                 $breakoutaction = new breakout_of_frame_action();
                 $link->add_action($breakoutaction);
             }