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

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index f904b33712b1fc22ecff5490977973a471b1d2c5..4e3b4a73b1e3c2abb461e5907659fd8bf17ada1f 100644 (file)
--- 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);
             }