Index: lib/class.tx_dam_tcefunc.php
===================================================================
--- lib/class.tx_dam_tcefunc.php (revision 42602)
+++ lib/class.tx_dam_tcefunc.php (working copy)
@@ -152,7 +152,7 @@
$treeViewObj->isTCEFormsSelectClass = true;
$treeViewObj->parentField = $TCA[$config['foreign_table']]['ctrl']['treeParentField'];
$treeViewObj->fieldArray = array('uid', $TCA[$config['foreign_table']]['ctrl']['label'], $treeViewObj->parentField);
-
+
// default_sortby might be not set
$defaultSortby = ($TCA[$config['foreign_table']]['ctrl']['default_sortby']) ? $GLOBALS['TYPO3_DB']->stripOrderBy($TCA[$config['foreign_table']]['ctrl']['default_sortby']) : '';
// sortby might be not set or unset
@@ -198,7 +198,7 @@
// be set in dam/mod_treebrowser/index.php as internal configuration logic
// Uschi: respect $TCA[table]['columns'][field]['config']['itemListStyle']
- // This will enable us to have a higher category selection tree.
+ // This will enable us to have a higher category selection tree.
if(isset($config['itemListStyle'])) {
$tempIframeStyle = t3lib_div::trimExplode(';', $config['itemListStyle']);
$iframestyle = array();
@@ -212,8 +212,8 @@
$iframeHeight = ($iframestyle['height']) ? $iframestyle['height'] : NULL;
$thumbnails = $renderBrowseTrees->renderIFrame($iframeWidth, $iframeHeight);
-
+
} else {
// tree frame
$renderBrowseTrees->renderBrowsableTrees($browseTree);
@@ -256,7 +256,7 @@
$maxitems = t3lib_div::intInRange($config['maxitems'], 0);
if (!$maxitems) $maxitems = 100000;
$selectedListStyle = ($config['selectedListStyle']) ? ' style="' .$config['selectedListStyle'] .'"' : ' style="width:200px"';
-
+
$this->tceforms->requiredElements[$PA['itemFormElName']] = array($minitems, $maxitems, 'imgName' => $table.'_'.$row['uid'].'_'.$field);
@@ -623,9 +623,8 @@
$iconTag = $this->tceforms->getClickMenu($iconTag, 'tx_dam', $row['uid']);
}
- $title = t3lib_div::fixed_lgd_cs($this->tceforms->noTitle($row['title']), $this->tceforms->titleLen);
+ $title = $row['title'] ? t3lib_div::fixed_lgd_cs($row['title'], $this->tceforms->titleLen) : t3lib_BEfunc::getNoRecordTitle();
-
// Create link to showing details about the file in a window:
if ($fileExists) {
#$Ahref = $GLOBALS['BACK_PATH'].'show_item.php?table='.rawurlencode($absFilePath).'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
@@ -823,8 +822,8 @@
''.htmlspecialchars($row['file_name']).'
';
$itemMediaInfo .= ''.$this->tceforms->sL('LLL:EXT:dam/locallang_db.xml:tx_dam_item.file_path', true).'
'.
- ''.htmlspecialchars($row['file_path']).'
';
-
+ ''.htmlspecialchars($row['file_path']).'';
+
if ($row['media_type'] == TXDAM_mtype_image) {
$out = '';
$out .= $row['hpixels'] ? $row['hpixels'].'x'.$row['vpixels'].' px, ' : '';
@@ -1146,8 +1145,8 @@
$pTitle = is_array($pRec) ? $pRec[$GLOBALS['TCA'][$pp['table']]['ctrl']['label']] : NULL;
}
if ($pTitle) {
- $pTitle = t3lib_div::fixed_lgd_cs($this->tceforms->noTitle($pTitle), $this->tceforms->titleLen);
- $pUid = $pp['table'].'_'.$pp['id'];
+ $pTitle = $pTitle ? t3lib_div::fixed_lgd_cs($pTitle, $this->tceforms->titleLen) : t3lib_BEfunc::getNoRecordTitle();
+ $pUid = $pp['table'] . '_' . $pp['id'];
$uidList[] = $pUid;
$opt[] = '';
}