Permalink
Browse files

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

…MOODLE_20_STABLE
  • Loading branch information...
Sam Hemelryk
Sam Hemelryk committed Jun 22, 2011
2 parents 3e6c1d4 + 41c5f54 commit 8445c4724c4e2ec7b5a7e23ed66230f6f6602d55
Showing with 2,150 additions and 2,112 deletions.
  1. +1 −0 lib/olson.php
  2. +2,149 −2,112 lib/timezone.txt
View
@@ -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!
Oops, something went wrong.

0 comments on commit 8445c47

Please sign in to comment.