[xoops-svn] SF.net SVN: xoops:[10148] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<du...@us...>]

Revision: 10148
          http://xoops.svn.sourceforge.net/xoops/?rev=10148&view=rev
Author:   dugris
Date:     2012-09-07 02:45:40 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
fix : date_default_timezone_set

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/locale.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php	2012-09-07 00:16:43 UTC (rev 10147)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php	2012-09-07 02:45:40 UTC (rev 10148)
@@ -19,7 +19,6 @@
 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
     set_magic_quotes_runtime(0);
 }
-date_default_timezone_set('Europe/London');
 
 global $xoops;
 $GLOBALS['xoops'] =& $xoops;
@@ -146,8 +145,11 @@
  */
 $xoops->preload->triggerEvent('core.include.common.language');
 $xoops->loadLanguage('global');
+$xoops->loadLanguage('locale');
 $xoops->loadLanguage('errors');
 
+date_default_timezone_set(_TIMEZONE_SET);
+
 /**
  * User Sessions
  */

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/locale.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/locale.php	2012-09-07 00:16:43 UTC (rev 10147)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/locale.php	2012-09-07 02:45:40 UTC (rev 10148)
@@ -32,6 +32,7 @@
 define("_YEARMONTHDAY", "Y/n/j G:i");
 define("_ELAPSE", "%s ago");
 define("_TIMEFORMAT_DESC", "Valid formats: \"s\" - " . _SHORTDATESTRING . "; \"m\" - " . _MEDIUMDATESTRING . "; \"l\" - " . _DATESTRING . ";<br />" . "\"c\" or \"custom\" - format determined according to interval to present; \"e\" - Elapsed; \"mysql\" - Y-m-d H:i:s;<br />" . "specified string - Refer to <a href=\"http://php.net/manual/en/function.date.php\" rel=\"external\">PHP manual</a>.");
+define("_TIMEZONE_SET", "Europe/London");
 
 /**
  * A Xoops Local

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.