/***************************************************************
* Copyright notice
*
-* (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
+* (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
* $Id$
* Revised for TYPO3 3.6 September/2003 by Kasper Skaarhoj
*
- * @author Kasper Skaarhoj <kasper@typo3.com>
+ * @author Kasper Skaarhoj <kasperYYYY@typo3.com>
*/
/**
* [CLASS/FUNCTION INDEX of SCRIPT]
* Load database groups (relations)
* Used to process the relations created by the TCA element types "group" and "select" for database records. Manages MM-relations as well.
*
- * @author Kasper Skaarhoj <kasper@typo3.com>
+ * @author Kasper Skaarhoj <kasperYYYY@typo3.com>
* @package TYPO3
* @subpackage t3lib
*/
$this->tableArray[$tName] = Array();
if ($this->checkIfDeleted && $GLOBALS['TCA'][$tName]['ctrl']['delete']) {
$fieldN = $tName.'.'.$GLOBALS['TCA'][$tName]['ctrl']['delete'];
- $this->additionalWhere[$tName].=' AND NOT '.$fieldN;
+ $this->additionalWhere[$tName].=' AND '.$fieldN.'=0';
}
}
// Select all MM relations:
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', $tableName, 'uid_local='.intval($uid), '', 'sorting');
while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
- $theTable = $row['tablenames'] ? $row['tablenames'] : $this->firstTable; // If tablesnames columns exists and contain a name, then this value is the table, else it's the the firstTable...
+ $theTable = $row['tablenames'] ? $row['tablenames'] : $this->firstTable; // If tablesnames columns exists and contain a name, then this value is the table, else it's the firstTable...
if (($row['uid_foreign'] || $theTable=='pages') && $theTable && isset($this->tableArray[$theTable])) {
$this->itemArray[$key]['id'] = $row['uid_foreign'];
$this->itemArray[$key]['table'] = $theTable;
if ($GLOBALS['TCA'][$key]['ctrl']['label']) {
$from.= ','.$GLOBALS['TCA'][$key]['ctrl']['label']; // Titel
}
+ if ($GLOBALS['TCA'][$key]['ctrl']['label_alt']) {
+ $from.= ','.$GLOBALS['TCA'][$key]['ctrl']['label_alt']; // Alternative Title-Fields
+ }
if ($GLOBALS['TCA'][$key]['ctrl']['thumbnail']) {
$from.= ','.$GLOBALS['TCA'][$key]['ctrl']['thumbnail']; // Thumbnail
}
foreach($this->itemArray as $key => $val) {
$theRow = $this->results[$val['table']][$val['id']];
if ($theRow && is_array($TCA[$val['table']])) {
- $label = t3lib_div::fixed_lgd_cs(strip_tags($theRow[$TCA[$val['table']]['ctrl']['label']]),$titleLen);
+ $label = t3lib_div::fixed_lgd_cs(strip_tags(t3lib_BEfunc::getRecordTitle($val['table'], $theRow)),$titleLen);
$label = ($label)?$label:'[...]';
$output[]=str_replace(',','',$val['table'].'_'.$val['id'].'|'.rawurlencode($label));
}