Make sure all these links break out of subframes and go to mainframe

diff --git a/lib/weblib.php b/lib/weblib.php
index f0bddcb9a6ad47f934279a1ad059a68f340e492f..bbf7af7832702759310f9dde2006c988d63baa46 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -680,19 +680,19 @@ function user_login_string($course, $user=NULL) {
 
     if (isset($user->realuser)) {
         if ($realuser = get_record("user", "id", $user->realuser)) {
-            $realuserinfo = " [<a href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&return=$realuser->id\">$realuser->firstname $realuser->lastname</A>] ";
+            $realuserinfo = " [<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&return=$realuser->id\">$realuser->firstname $realuser->lastname</A>] ";
         }
     } else {
         $realuserinfo = "";
     }
 
     if (isset($user->id) and $user->id) {
-        $username = "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id\">$user->firstname $user->lastname</A>";
+        $username = "<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id\">$user->firstname $user->lastname</a>";
         $loggedinas = $realuserinfo.get_string("loggedinas", "moodle", "$username").
-                      " (<A HREF=\"$CFG->wwwroot/login/logout.php\">".get_string("logout")."</A>)";
+                      " (<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/login/logout.php\">".get_string("logout")."</a>)";
     } else {
         $loggedinas = get_string("loggedinnot", "moodle").
-                      " (<A HREF=\"$CFG->wwwroot/login/index.php\">".get_string("login")."</A>)";
+                      " (<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/login/index.php\">".get_string("login")."</a>)";
     }
     return $loggedinas;
 }