Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Jakub Turek 2015-04-27 17:19:26 +02:00
commit 5bc6a0d1cd

View file

@ -8,8 +8,8 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
if (empty(ini_get('date.timezone'))) {
$timezone = ini_get('date.timezone');
if (empty($timezone)) {
date_default_timezone_set('UTC');
}