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

…MOODLE_20_STABLE
moodle · Jun 22, 2011 · 8445c47 · 8445c47
2 parents 3e6c1d4 + 41c5f54
commit 8445c47
Show file tree

Hide file tree

Showing 2 changed files with 2,150 additions and 2,112 deletions.
diff --git a/lib/olson.php b/lib/olson.php
@@ -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!