navigation MDL-20324 Frame busting now occurs for every nav link if framename is...

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 4e3b4a73b1e3c2abb461e5907659fd8bf17ada1f..692fe67fd6215623bba3aeb1377b4910f80f51a8 100644 (file)
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -409,7 +409,7 @@ class navigation_node {
                 $link->add_class('dimmed');
             }
 
-            if (!empty($CFG->framename) && $PAGE->generaltype=='topframe') {
+            if (!empty($CFG->framename) && ($PAGE->generaltype=='topframe' || $CFG->framename!='_top')) {
                 $breakoutaction = new breakout_of_frame_action();
                 $link->add_action($breakoutaction);
             }