Index: typo3/db_new.php
===================================================================
--- typo3/db_new.php (revision 10101)
+++ typo3/db_new.php (working copy)
@@ -496,33 +496,28 @@
$nameParts = explode('_', $table);
$thisTitle = '';
if ($nameParts[0] == 'tx' || $nameParts[0] == 'tt') {
- // try to extract extension name
if (substr($v['ctrl']['title'], 0, 8) == 'LLL:EXT:') {
$_EXTKEY = substr($v['ctrl']['title'], 8);
$_EXTKEY = substr($_EXTKEY, 0, strpos($_EXTKEY, '/'));
- if ($_EXTKEY != '') {
- // first try to get localisation of extension title
- $temp = explode(':', substr($v['ctrl']['title'], 9 + strlen($_EXTKEY)));
- $langFile = $temp[0];
- $thisTitle = $GLOBALS['LANG']->sL('LLL:EXT:' . $_EXTKEY . '/' . $langFile . ':extension.title');
- // if no localisation available, read title from ext_emconf.php
- if (!$thisTitle && is_file(t3lib_extMgm::extPath($_EXTKEY) . 'ext_emconf.php')) {
- include(t3lib_extMgm::extPath($_EXTKEY) . 'ext_emconf.php');
- $thisTitle = $EM_CONF[$_EXTKEY]['title'];
- }
- $iconFile[$_EXTKEY] = '';
+ $temp = explode(':', substr($v['ctrl']['title'], 9 + strlen($_EXTKEY)));
+ $langFile = $temp[0];
+ $thisTitle = $GLOBALS['LANG']->sL('LLL:EXT:' . $_EXTKEY . '/' . $langFile . ':extension.title');
+ } else {
+ $_EXTKEY = $nameParts[1];
+ }
+ if (strlen($thisTitle) === 0) {
+ if (is_file(t3lib_extMgm::extPath($_EXTKEY) . 'ext_emconf.php')) {
+ include(t3lib_extMgm::extPath($_EXTKEY) . 'ext_emconf.php');
+ $thisTitle = (string) $EM_CONF[$_EXTKEY]['title'];
} else {
- $thisTitle = $nameParts[1];
- $iconFile[$_EXTKEY] = '';
+ $thisTitle = ucfirst($_EXTKEY);
}
- } else {
- $thisTitle = $nameParts[1];
- $iconFile[$_EXTKEY] = '';
}
+ $iconFile[$_EXTKEY] = '';
} else {
$_EXTKEY = 'system';
$thisTitle = $GLOBALS['LANG']->getLL('system_records');
- $iconFile['system'] = t3lib_iconWorks::getSpriteIcon('apps-pagetree-root');
+ $iconFile[$_EXTKEY] = t3lib_iconWorks::getSpriteIcon('apps-pagetree-root');
}
if($groupName == '' || $groupName != $_EXTKEY) {
@@ -734,4 +729,4 @@
$SOBE->main();
$SOBE->printContent();
-?>
+?>
\ No newline at end of file