- Only load external database when it is newer.

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 856b2025ccfa93393dfadb8901a5fb2313d948e5..44fccb67506a0062bb01f65a99c42ac34dceb485 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -665,8 +665,12 @@ PHP_FUNCTION(gmdate)
 /* {{{ php_date_set_tzdb - NOT THREADSAFE */
 PHPAPI void php_date_set_tzdb(timelib_tzdb *tzdb)
 {
-       php_date_global_timezone_db = tzdb;
-       php_date_global_timezone_db_enabled = 1;
+       timelib_tzdb *builtin = timelib_builtin_db();
+       
+       if (php_version_compare(tzdb->version, builtin->version) > 0) {
+               php_date_global_timezone_db = tzdb;
+               php_date_global_timezone_db_enabled = 1;
+       }
 }
 /* }}} */