Merge branch 'MDL-27966_m20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

2011-06-22 17:16:00 +08:00
parent 3e6c1d4d55 41c5f54940
commit 8445c4724c
2 changed files with 2150 additions and 2112 deletions
@@ -688,6 +688,7 @@ function olson_parse_at ($at, $set = 'set', $gmtoffset) {
        $at  = substr($at, 0, strlen($at)-1); // chop
    }

+    $at = (strpos($at, ':') === false) ? $at . ':0' : $at;
    list($hours, $mins) = explode(':', $at);

    // GMT -- return as is!