Merge branch 'MDL-42808-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

This commit is contained in:
Damyon Wiese
2013-11-18 15:27:53 +08:00
2 changed files with 8 additions and 1 deletions
+2 -1
View File
@@ -30,7 +30,8 @@ if (! function_exists('http_build_query')) {
}
if (! ini_get('date.timezone') && function_exists('date_default_timezone_set')) {
date_default_timezone_set('UTC');
// Library hack. See MDL-42808.
// date_default_timezone_set('UTC');
}
// hack around with the include paths a bit so the library 'just works'
+6
View File
@@ -10,6 +10,12 @@ that was that we could force Google lib to use our implementation of curl.
If you upgrade the library, please check if the method Google_CurlIO::makeRequest()
has been updated and would require change in moodle_google_curlio.
Library hack
------------
* The file Google_Client.php resets the timezone to UTC. The line
date_default_timezone_set('UTC'); should be commented out. See MDL-42808.
Information
-----------