Re-introducing colons in page names + cleaning tabs output. MDL-15896 ; merged from...

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 51dc4aed0d906fb3623fd8b4ab05bf3ba2769b00..375989a622afa4921bb7f243d90f1e33026d17a9 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -13,7 +13,7 @@
     $ewiki_action = optional_param('ewiki_action', '', PARAM_ALPHA);     // Action on Wiki-Page
     $id           = optional_param('id', 0, PARAM_INT);                  // Course Module ID, or
     $wid          = optional_param('wid', 0, PARAM_INT);                 // Wiki ID
-    $page         = optional_param('page', false, PARAM_PATH);           // Wiki Page Name
+    $page         = optional_param('page', false);                       // Wiki Page Name
     $q            = optional_param('q',"", PARAM_PATH);                  // Search Context
     $userid       = optional_param('userid', 0, PARAM_INT);              // User wiki.
     $groupid      = optional_param('groupid', 0, PARAM_INT);             // Group wiki.
@@ -358,7 +358,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;
             }