Reverted page type label from Folder to SysFolder as it affected old versions, introd...

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

diff --git a/ChangeLog b/ChangeLog
index b3b4f1c..b5b5c7d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
        * Fixed issue #16985: Rename Sysfolder to Folder
        * Follow-up to #16857: Changed label "Include Subpages" to "Extend to Subpages"
        * Reverted changes in CSH where SysFolder was renamed to to Folder - will be re-added with updated CSH
+       * Reverted page type label from Folder to SysFolder as it affected old versions, introduced a new label "Folder" for versions 4.5+
 
 2011-01-12  Sebastian Kurfuerst  <sebastian@typo3.org>
 

diff --git a/t3lib/stddb/tbl_pages.php b/t3lib/stddb/tbl_pages.php
index 4e998bb..e6d4b10 100644 (file)
--- a/t3lib/stddb/tbl_pages.php
+++ b/t3lib/stddb/tbl_pages.php
@@ -55,7 +55,7 @@ $TCA['pages'] = array(
                                                '--div--',
                                        ),
                                        array(
-                                               'LLL:EXT:lang/locallang_tca.xml:doktype.I.1',
+                                               'LLL:EXT:lang/locallang_tca.xml:doktype.I.folder',
                                                (string) t3lib_pageSelect::DOKTYPE_SYSFOLDER,
                                                'i/sysf.gif',
                                        ),

diff --git a/typo3/sysext/lang/locallang_tca.xml b/typo3/sysext/lang/locallang_tca.xml
index b236123..9b8a9a7 100755 (executable)
--- a/typo3/sysext/lang/locallang_tca.xml
+++ b/typo3/sysext/lang/locallang_tca.xml
@@ -89,7 +89,8 @@
                        <label index="sys_workspace.stagechg_notification">Stage change notification by email:</label>
                        <label index="pages">Page</label>
                        <label index="doktype.I.0">Standard</label>
-                       <label index="doktype.I.1">Folder</label>
+                       <label index="doktype.I.1">SysFolder</label>
+                       <label index="doktype.I.folder">Folder</label>
                        <label index="doktype.I.2">Recycler</label>
                        <label index="title">Pagetitle:</label>
                        <label index="php_tree_stop">Stop page tree:</label>