Merged fix from stable

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 3db2643d47de8cfcd8507fdd257829539c3b58a3..a674133ecb141dede94a5fbd4d9e78456fe7e4bc 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -697,6 +697,8 @@ function wiki_add_entry(&$wiki, &$course, $userid=0, $groupid=0) {
         $wiki_entry->timemodified = time();
         break;
     }
+    $wiki_entry->pagename = addslashes($wiki_entry->pagename);
+
     return insert_record("wiki_entries", $wiki_entry, true);
 }