Too much restrictive optional_param was producing

some undesired efects with formats. Bug 4858.
(http://moodle.org/bugs/bug.php?op=show&bugid=4858)

Merged from MOODLE_15_STABLE

diff --git a/mod/glossary/showentry.php b/mod/glossary/showentry.php
index b1987211b772ad6869660f2998210494188b19ea..4d9acafc1131383e929171af398eb217e1c57dc2 100644 (file)
--- a/mod/glossary/showentry.php
+++ b/mod/glossary/showentry.php
@@ -5,7 +5,7 @@
     $concept  = optional_param('concept', '', PARAM_CLEAN);
     $courseid = optional_param('courseid', 0, PARAM_INT);
     $eid      = optional_param('eid', 0, PARAM_INT); // glossary entry id
-    $displayformat = optional_param('displayformat',-1, PARAM_INT);
+    $displayformat = optional_param('displayformat',-1, PARAM_SAFEDIR);
 
     if ($CFG->forcelogin) {
         require_login();