Permalink
Browse files

Merge branch 'MDL-36773-22' of git://github.com/mouneyrac/moodle into…

… MOODLE_22_STABLE
  • Loading branch information...
2 parents 0e84704 + ab1623b commit 4c34df5e5c62a162f4abdc5d0d11c37c143f46b1 @danpoltawski danpoltawski committed Dec 11, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/moodlelib.php
View
@@ -1117,7 +1117,7 @@ function clean_param($param, $type) {
case PARAM_TIMEZONE: //can be int, float(with .5 or .0) or string seperated by '/' and can have '-_'
$param = fix_utf8($param);
- $timezonepattern = '/^(([+-]?(0?[0-9](\.[5|0])?|1[0-3]|1[0-2]\.5))|(99)|[[:alnum:]]+(\/?[[:alpha:]_-])+)$/';
+ $timezonepattern = '/^(([+-]?(0?[0-9](\.[5|0])?|1[0-3](\.0)?|1[0-2]\.5))|(99)|[[:alnum:]]+(\/?[[:alpha:]_-])+)$/';
if (preg_match($timezonepattern, $param)) {
return $param;
} else {

0 comments on commit 4c34df5

Please sign in to comment.