Index: lib/weblib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v
retrieving revision 1.970.2.77
diff -u -r1.970.2.77 weblib.php
--- lib/weblib.php	1 Apr 2008 19:47:47 -0000	1.970.2.77
+++ lib/weblib.php	23 Apr 2008 15:27:35 -0000
@@ -5311,6 +5311,7 @@
             $selectmod = $mod;
             $backmod = $previousmod;
             $flag = true; // set flag so we know to use next mod for "next"
+            $mod->oldname = $mod->name;
             $mod->name = $strjumpto;
             $strjumpto = '';
         } else {
@@ -5356,10 +5357,17 @@
                    '</button></fieldset></form></li>';
     }
 
-    return '<div class="navigation">'."\n".'<ul>'.$logslink . $backmod .
+    $result='<div class="navigation">'."\n".'<ul>'.$logslink . $backmod .
             '<li>'.popup_form($CFG->wwwroot .'/mod/', $menu, 'navmenupopup', $selected, $strjumpto,
                        '', '', true, $targetwindow, '', $menustyle).'</li>'.
             $nextmod . '</ul>'."\n".'</div>';
+
+    // Need to tidy up $modinfo as we are working with a reference to the cache!
+    if(array_key_exists($cm,$modinfo->cms) && isset($modinfo->cms[$cm]->oldname)) {            
+        $modinfo->cms[$cm]->name=$modinfo->cms[$cm]->oldname;
+        unset($modinfo->cms[$cm]->oldname);
+    }
+    return $result;
 }
 
 /**