Backporting MDL-15896 (tabs and recent activity) from HEAD

mod/wiki/lib.php

@@ -206,6 +206,10 @@ function wiki_print_recent_activity($course, $isteacher, $timestart) {
         //Obtain the visible property from the instance
         $modvisible = instance_is_visible($log->module,$tempmod);
 
+    /// Process log->url and rebuild it here to properly clean the pagename - MDL-15896
+        $extractedpage = preg_replace('/^.*&page=/', '', $log->url);
+        $log->url = preg_replace('/page=.*$/', 'page='.urlencode($extractedpage), $log->url);
+
         //Only if the mod is visible
         if ($modvisible) {
             $wikis[$log->info] = wiki_log_info($log);
@@ -1670,4 +1674,4 @@ function wiki_release_lock($wikiid,$pagename) {
 }
 
 
-?>
+?>

mod/wiki/view.php

@@ -366,7 +366,7 @@
         $currenttab = '';
         foreach ($tabs as $tab) {
             $tabname = get_string("tab$tab", 'wiki');
-            $row[] = new tabobject($tabname, $ewbase.'&page='.$tab.'/'.$ewiki_id, $tabname);
+            $row[] = new tabobject($tabname, $ewbase.'&page='.$tab.'/'.s($ewiki_id), $tabname);
             if ($ewiki_action == "$tab" or in_array($page, $specialpages)) {
                 $currenttab = $tabname;
             }