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

10 years ago · 5bc6a0d1cd
1 changed files with 2 additions and 2 deletions
--- a/bin/mage
+++ b/bin/mage
@ -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');
 }