Change rule to tzrule (reserved word)

diff --git a/lib/olson.php b/lib/olson.php
index 4c2ac6ae157e151e311dec29884098ba0e335924..ac8349236337001c6db042fef579f8f872f4809d 100644 (file)
--- a/lib/olson.php
+++ b/lib/olson.php
@@ -168,6 +168,16 @@ if(isset($mdl_tz['dst_time']) && !strpos($mdl_tz['dst_time'], ':') || isset($mdl
     }
     */
 
+/// Since Moodle 1.7, rule is tzrule in DB (reserved words problem), so change it here
+/// after everything is calculated to be properly loaded to the timezone table.
+/// Pre 1.7 users won't have the old rule if updating this from moodle.org but it
+/// seems that such field isn't used at all by the rest of Moodle (at least I haven't 
+/// found any use when looking for it).
+
+    foreach($mdl_zones as $key=>$mdl_zone) {
+        $mdl_zones[$key]['tzrule'] = $mdl_zones[$key]['rule'];
+    }
+    
     return $mdl_zones;
 }