Added Feature #12229: Add stdWrap date/strftime with GMT format property

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7321 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index ed7e098..c0a0dc8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-04-13  Steffen Kamper  <info@sk-typo3.de>
 
+       * Added Feature #12229: Add stdWrap date/strftime with GMT format property
        * Fixed bug #13402: Active suggest feature for TCA fields with foreign tables
        * Fixed bug #13788: [felogin] Redirects use incorrect function parameters
        * Updated manual of felogin (thanks to Jigal van Hemert and Jeff Segars)

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index b4293ca..464884b 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -3763,9 +3763,11 @@ class tslib_cObj {
                                if ($conf['prioriCalc']){$content=t3lib_div::calcParenthesis($content); if ($conf['prioriCalc']=='intval') $content=intval($content);}
                                if ((string)$conf['char']!=''){$content=chr(intval($conf['char']));}
                                if ($conf['intval']){$content=intval($content);}
-                               if ($conf['date']){$content=date($conf['date'], $content);}
-                               if ($conf['strftime']){
-                                       $content = strftime($conf['strftime'], $content);
+                               if ($conf['date']) {
+                                       $content = ($conf['date.']['GMT'] ? gmdate($conf['date'], $content) : date($conf['date'], $content));
+                               }
+                               if ($conf['strftime']) {
+                                       $content = ($conf['strftime.']['GMT'] ? gmstrftime($conf['strftime'], $content) : strftime($conf['strftime'], $content));
                                        $tmp_charset = $conf['strftime.']['charset'] ? $conf['strftime.']['charset'] : $GLOBALS['TSFE']->localeCharset;
                                        if ($tmp_charset)       {
                                                $content = $GLOBALS['TSFE']->csConv($content,$tmp_charset);