Index: t3lib/class.t3lib_div.php
===================================================================
--- t3lib/class.t3lib_div.php (revision 5791)
+++ t3lib/class.t3lib_div.php (working copy)
@@ -1953,6 +1953,23 @@
}
/**
+ * Rename Array keys with a given mapping table
+ * @param array Array by reference which should be remapped
+ * @param array Array with remap information, array/$oldKey => $newKey)
+ */
+ function remapArrayKeys(&$array, $mappingTable) {
+ if (is_array($mappingTable)) {
+ foreach ($mappingTable as $old => $new) {
+ if ($new && isset($array[$old])) {
+ $array[$new] = $array[$old];
+ unset ($array[$old]);
+ }
+ }
+ }
+ }
+
+
+ /**
* Merges two arrays recursively and "binary safe" (integer keys are
* overridden as well), overruling similar values in the first array
* ($arr0) with the values of the second array ($arr1)
Index: t3lib/class.t3lib_tsparser_ext.php
===================================================================
--- t3lib/class.t3lib_tsparser_ext.php (revision 5791)
+++ t3lib/class.t3lib_tsparser_ext.php (working copy)
@@ -134,6 +134,7 @@
'ctable' => Array('Content: \'Table\'', 'mf'),
'cuploads' => Array('Content: \'Filelinks\'', 'mg'),
'cmultimedia' => Array('Content: \'Multimedia\'', 'mh'),
+ 'cmedia' => Array('Content: \'Media\'', 'mr'),
'cmailform' => Array('Content: \'Form\'', 'mi'),
'csearch' => Array('Content: \'Search\'', 'mj'),
'clogin' => Array('Content: \'Login\'', 'mk'),
Index: typo3/index.php
===================================================================
--- typo3/index.php (revision 5791)
+++ typo3/index.php (working copy)
@@ -312,16 +312,20 @@
'NEWS' => $this->makeLoginNews(),
'COPYRIGHT' => $this->makeCopyrightNotice(),
'CSS_ERRORCLASS' => ($this->commandLI ? ' class="error"' : ''),
+ 'SITE_LINK' => '###SITENAME###',
// the labels will be replaced later on, thus the other parts above
// can use these markers as well and it will be replaced
'HEADLINE' => $GLOBALS['LANG']->getLL('headline', true),
- 'INFO' => $GLOBALS['LANG']->getLL('info.jscookies', true),
+ 'INFO_ABOUT' => $GLOBALS['LANG']->getLL('info.about', true),
+ 'INFO_RELOAD' => $GLOBALS['LANG']->getLL('info.reload', true),
'ERROR_JAVASCRIPT' => $GLOBALS['LANG']->getLL('error.javascript', true),
'ERROR_COOKIES' => $GLOBALS['LANG']->getLL('error.cookies', true),
+ 'ERROR_CAPSLOCK' => $GLOBALS['LANG']->getLL('error.capslock', true),
'LABEL_DONATELINK' => $GLOBALS['LANG']->getLL('labels.donate', true),
'LABEL_USERNAME' => $GLOBALS['LANG']->getLL('labels.username', true),
'LABEL_PASSWORD' => $GLOBALS['LANG']->getLL('labels.password', true),
+ 'CLEAR' => $GLOBALS['LANG']->getLL('clear', true),
// global variables will now be replaced (at last)
'SITENAME' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']
@@ -434,10 +438,10 @@
';
}
$this->interfaceSelector='
-