Better getRecordTitle() function introducing label_userFunc.
authorIngmar Schlecht <ingmar.schlecht@typo3.org>
Tue, 12 Dec 2006 11:24:10 +0000 (11:24 +0000)
committerIngmar Schlecht <ingmar.schlecht@typo3.org>
Tue, 12 Dec 2006 11:24:10 +0000 (11:24 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1868 709f56b5-9817-0410-a4d7-c38de5d9e867

16 files changed:
ChangeLog
t3lib/class.t3lib_befunc.php
t3lib/class.t3lib_positionmap.php
t3lib/class.t3lib_tceforms.php
typo3/alt_clickmenu.php
typo3/alt_doc.php
typo3/alt_shortcut.php
typo3/class.browse_links.php
typo3/class.db_list_extra.inc
typo3/class.show_rechis.inc
typo3/move_el.php
typo3/sysext/cms/layout/class.tx_cms_layout.php
typo3/sysext/cms/layout/db_new_content_el.php
typo3/sysext/impexp/app/index.php
typo3/sysext/sys_action/class.tx_sysaction.php
typo3/sysext/version/cm1/index.php

index 59470e7..09e918a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-12-12  Ingmar Schlecht  <ingmar@typo3.org>
+
+       * Better getRecordTitle() function introducing label_userFunc (Thanks to David Brühlmeier for this patch! See http://lists.netfielders.de/pipermail/typo3-team-core/2006-December/006521.html for details.)
 
 2006-12-11  Martin Kutschker  <martin.t.kutschker@blackbox.net>
 
index 76aa24e..d68f287 100755 (executable)
@@ -1816,26 +1816,43 @@ class t3lib_BEfunc      {
         * @param       string          Table name, present in TCA
         * @param       array           Row from table
         * @param       boolean         If set, result is prepared for output: The output is cropped to a limited lenght (depending on BE_USER->uc['titleLen']) and if no value is found for the title, '<em>[No title]</em>' is returned (localized). Further, the output is htmlspecialchars()'ed
+        * @param       boolean         If set, the function always returns an output. If no value is found for the title, '[No title]' is returned (localized).
         * @return      string
         */
-       function getRecordTitle($table,$row,$prep=0)    {
+       function getRecordTitle($table,$row,$prep=FALSE,$forceResult=TRUE)      {
                global $TCA;
-               if (is_array($TCA[$table]))     {
-                       $t = $row[$TCA[$table]['ctrl']['label']];
-                       if ($TCA[$table]['ctrl']['label_alt'] && ($TCA[$table]['ctrl']['label_alt_force'] || !strcmp($t,'')))   {
-                               $altFields=t3lib_div::trimExplode(',',$TCA[$table]['ctrl']['label_alt'],1);
-                               $tA=array();
-                               $tA[]=$t;
-                               while(list(,$fN)=each($altFields))      {
-                                       $t = $tA[] = trim(strip_tags($row[$fN]));
-                                       if (strcmp($t,'') && !$TCA[$table]['ctrl']['label_alt_force'])  break;
+               if (is_array($TCA[$table]))     {                       
+
+                               // If configured, call userFunc
+                       if ($TCA[$table]['ctrl']['label_userFunc'])     {
+                               $params['table'] = $table;
+                               $params['row'] = $row;
+                               $params['title'] = '';
+
+                               t3lib_div::callUserFunction($TCA[$table]['ctrl']['label_userFunc'],$params,$this);
+                               $t = $params['title'];
+                       } else {
+
+                                       // No userFunc: Build label
+                               $t = $row[$TCA[$table]['ctrl']['label']];
+                               if ($TCA[$table]['ctrl']['label_alt'] && ($TCA[$table]['ctrl']['label_alt_force'] || !strcmp($t,'')))   {
+                                       $altFields=t3lib_div::trimExplode(',',$TCA[$table]['ctrl']['label_alt'],1);
+                                       $tA=array();
+                                       $tA[]=$t;
+                                       foreach ($altFields as $fN)     {
+                                               $t = $tA[] = trim(strip_tags($row[$fN]));
+                                               if (strcmp($t,'') && !$TCA[$table]['ctrl']['label_alt_force'])  break;
+                                       }
+                                       if ($TCA[$table]['ctrl']['label_alt_force'])    $t=implode(', ',$tA);
                                }
-                               if ($TCA[$table]['ctrl']['label_alt_force'])    $t=implode(', ',$tA);
                        }
-                       if ($prep)      {
-                               $t = htmlspecialchars(t3lib_div::fixed_lgd_cs($t,$GLOBALS['BE_USER']->uc['titleLen']));
-                               if (!strcmp(trim($t),''))       $t='<em>['.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.no_title',1).']</em>';
+
+                               // If the current result is empty, set it to '[No title]' (localized) and prepare for output if requested
+                       if ($prep || $forceResult)      {
+                               if (!strcmp(trim($t),''))       $t='['.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.no_title',1).']';
+                               if ($prep)      $t = '<em>'.htmlspecialchars(t3lib_div::fixed_lgd_cs($t,$GLOBALS['BE_USER']->uc['titleLen'])).'</em>';                          
                        }
+
                        return $t;
                }
        }
index f0ae554..4b5632b 100755 (executable)
@@ -540,7 +540,7 @@ class t3lib_positionMap {
         */
        function getRecordHeader($row)  {
                $line = t3lib_iconWorks::getIconImage('tt_content',$row,$this->backPath,' align="top" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($row,'tt_content')).'"');
-               $line.= t3lib_BEfunc::getRecordTitle('tt_content',$row,1);
+               $line.= t3lib_BEfunc::getRecordTitle('tt_content',$row,TRUE);
                return $this->wrapRecordTitle($line,$row);
        }
 
index 66e6e7d..93d6bb7 100755 (executable)
@@ -213,7 +213,7 @@ class t3lib_TCEforms        {
        var $loadMD5_JS=1;
        var $prevBorderStyle='[nothing here...]';       // Something unique...
        var $allowUpload=0;                             // If set direct upload fields will be shown
-       var $titleLen=15;                                       // $BE_USER->uc['titleLen'] but what is default??
+       var $titleLen=15;                                       // @deprecated: $BE_USER->uc['titleLen'] but what is default??
        var $defaultLanguageData = array();     // Array where records in the default language is stored. (processed by transferdata)
        var $defaultLanguageData_diff = array();        // Array where records in the default language is stored (raw without any processing. used for making diff)
        var $additionalPreviewLanguageData = array();
@@ -347,7 +347,7 @@ class t3lib_TCEforms        {
                $this->edit_showFieldHelp = $BE_USER->uc['edit_showFieldHelp'];
 
                $this->edit_docModuleUpload = $BE_USER->uc['edit_docModuleUpload'];
-               $this->titleLen = $BE_USER->uc['titleLen'];
+               $this->titleLen = $BE_USER->uc['titleLen'];             // @deprecated
 
                $this->inline->init($this);
        }
@@ -1953,7 +1953,7 @@ class t3lib_TCEforms      {
                                                $imgs[] = '<span class="nobr">'.
                                                                $this->getClickMenu(t3lib_iconWorks::getIconImage($this_table,$rr,$this->backPath,'align="top" title="'.htmlspecialchars(t3lib_BEfunc::getRecordPath($rr['pid'],$perms_clause,15)).' [UID: '.$rr['uid'].']"'),$this_table, $this_uid).
                                                                '&nbsp;'.
-                                                               htmlspecialchars(t3lib_div::fixed_lgd_cs($this->noTitle($rr[$GLOBALS['TCA'][$this_table]['ctrl']['label']],array('<em>','</em>')),$this->titleLen)).' <span class="typo3-dimmed"><em>['.$rr['uid'].']</em></span>'.
+                                                               t3lib_BEfunc::getRecordTitle($this_table,$rr,TRUE).' <span class="typo3-dimmed"><em>['.$rr['uid'].']</em></span>'.
                                                                '</span>';
                                        }
                                }
@@ -3014,7 +3014,7 @@ class t3lib_TCEforms      {
                                        while(list(,$pp)=each($itemArray))      {
                                                $pRec = t3lib_BEfunc::getRecordWSOL($pp['table'],$pp['id']);
                                                if (is_array($pRec))    {
-                                                       $pTitle = t3lib_div::fixed_lgd_cs($this->noTitle(t3lib_BEfunc::getRecordTitle($pp['table'], $pRec)),$this->titleLen);
+                                                       $pTitle = t3lib_BEfunc::getRecordTitle($pp['table'], $pRec, FALSE, TRUE);
                                                        $pUid = $pp['table'].'_'.$pp['id'];
                                                        $uidList[]=$pUid;
                                                        $opt[]='<option value="'.htmlspecialchars($pUid).'">'.htmlspecialchars($pTitle).'</option>';
@@ -3526,9 +3526,12 @@ class t3lib_TCEforms     {
        /**
         * Returns the "No title" string if the input $str is empty.
         *
+        * DEPRECATED: Use t3lib_BEfunc::getRecordTitle with the $forceResult flag set.
+        *
         * @param       string          The string which - if empty - will become the no-title string.
         * @param       array           Array with wrappin parts for the no-title output (in keys [0]/[1])
         * @return      string
+        * @deprecated
         */
        function noTitle($str,$wrapParts=array())       {
                return strcmp($str,'') ? $str : $wrapParts[0].'['.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.no_title').']'.$wrapParts[1];
@@ -4073,7 +4076,7 @@ class t3lib_TCEforms      {
 
                                // Add the item:
                        $items[] = array(
-                               t3lib_div::fixed_lgd_cs($lPrefix.strip_tags(t3lib_BEfunc::getRecordTitle($f_table,$row)),$this->titleLen),
+                               $lPrefix.strip_tags(t3lib_BEfunc::getRecordTitle($f_table,$row)),
                                $uidPre.$row['uid'],
                                $icon
                        );
index 592d1a8..3f37dcb 100755 (executable)
@@ -332,7 +332,7 @@ class clickMenu {
                return $this->printItems($menuItems,
                        $root?
                        '<img'.t3lib_iconWorks::skinImg($this->PH_backPath,'gfx/i/_icon_website.gif','width="18" height="16"').' class="absmiddle" alt="" />'.htmlspecialchars($GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']):
-                       t3lib_iconWorks::getIconImage($table,$this->rec,$this->PH_backPath,' class="absmiddle" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($this->rec,$table)).'"').t3lib_BEfunc::getRecordTitle($table,$this->rec,1)
+                       t3lib_iconWorks::getIconImage($table,$this->rec,$this->PH_backPath,' class="absmiddle" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($this->rec,$table)).'"').t3lib_BEfunc::getRecordTitle($table,$this->rec,TRUE)
                );
        }
 
@@ -370,7 +370,7 @@ class clickMenu {
                return $this->printItems($menuItems,
                        $root?
                        '<img'.t3lib_iconWorks::skinImg($this->PH_backPath,'gfx/i/_icon_website.gif','width="18" height="16"').' class="absmiddle" alt="" />'.htmlspecialchars($GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']):
-                       t3lib_iconWorks::getIconImage($table,$this->rec,$this->PH_backPath,' class="absmiddle" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($this->rec,$table)).'"').t3lib_BEfunc::getRecordTitle($table,$this->rec,1)
+                       t3lib_iconWorks::getIconImage($table,$this->rec,$this->PH_backPath,' class="absmiddle" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($this->rec,$table)).'"').t3lib_BEfunc::getRecordTitle($table,$this->rec,TRUE)
                );
        }
 
@@ -1041,7 +1041,7 @@ class clickMenu {
 
                        // Return the printed elements:
                return $this->printItems($menuItems,
-                       t3lib_iconWorks::getIconImage($table,$this->rec,$this->PH_backPath,' class="absmiddle" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($this->rec,$table)).'"').t3lib_BEfunc::getRecordTitle($table,$this->rec,1)
+                       t3lib_iconWorks::getIconImage($table,$this->rec,$this->PH_backPath,' class="absmiddle" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($this->rec,$table)).'"').t3lib_BEfunc::getRecordTitle($table,$this->rec,TRUE)
                );
        }
 
index c5231a5..24297ac 100755 (executable)
@@ -709,7 +709,7 @@ class SC_alt_doc {
                                                                                // Setting visual path / title of form:
                                                                        $this->generalPathOfForm = $this->tceforms->getRecordPath($table,$rec);
                                                                        if (!$this->storeTitle) {
-                                                                               $this->storeTitle = $this->recTitle ? htmlspecialchars($this->recTitle) : t3lib_BEfunc::getRecordTitle($table,$rec,1);
+                                                                               $this->storeTitle = $this->recTitle ? htmlspecialchars($this->recTitle) : t3lib_BEfunc::getRecordTitle($table,$rec,TRUE);
                                                                        }
 
                                                                                // Setting variables in TCEforms object:
index 04096c0..7cfae03 100755 (executable)
@@ -394,7 +394,7 @@ class SC_alt_shortcut {
                if (!$this->editLoaded && t3lib_extMgm::isLoaded('cms'))        {
                                $editIdCode = '<td nowrap="nowrap">'.$LANG->getLL('shortcut_editID',1).': <input type="text" value="'.($this->editError?htmlspecialchars($this->editPage):'').'" name="editPage"'.$this->doc->formWidth(15).' onchange="submitEditPage(this.value);" />'.
                                        ($this->editError?'&nbsp;<strong><span class="typo3-red">'.htmlspecialchars($this->editError).'</span></strong>':'').
-                                       (is_array($this->theEditRec)?'&nbsp;<strong>'.$LANG->getLL('shortcut_loadEdit',1).' \''.t3lib_BEfunc::getRecordTitle('pages',$this->theEditRec,1).'\'</strong> ('.htmlspecialchars($this->editPath).')':'').
+                                       (is_array($this->theEditRec)?'&nbsp;<strong>'.$LANG->getLL('shortcut_loadEdit',1).' \''.t3lib_BEfunc::getRecordTitle('pages',$this->theEditRec,TRUE).'\'</strong> ('.htmlspecialchars($this->editPath).')':'').
                                        ($this->searchFor?'&nbsp;'.$LANG->getLL('shortcut_searchFor',1).' <strong>\''.htmlspecialchars($this->searchFor).'\'</strong>':'').
                                        '</td>';
                } else $editIdCode = '';
index 3df3af0..96b81d3 100755 (executable)
@@ -218,7 +218,7 @@ class TBE_browser_recordList extends localRecordList {
                        $code = htmlspecialchars(t3lib_div::fixed_lgd_cs($code,$this->fixedL));
                }
 
-               $title = t3lib_BEfunc::getRecordTitle($table,$row);
+               $title = t3lib_BEfunc::getRecordTitle($table,$row,FALSE,TRUE);
                $ficon = t3lib_iconWorks::getIcon($table,$row);
                $aOnClick = "return insertElement('".$table."', '".$row['uid']."', 'db', ".t3lib_div::quoteJSvalue($title).", '', '', '".$ficon."');";
                $ATag = '<a href="#" onclick="'.$aOnClick.'">';
index 6d7ee80..7e19d38 100755 (executable)
@@ -580,14 +580,11 @@ class localRecordList extends recordList {
                        // Overriding with versions background color if any:
                $row_bgColor = $row['_CSSCLASS'] ? ' class="'.$row['_CSSCLASS'].'"' : $row_bgColor;
 
-                       // Initialization
-               $alttext = t3lib_BEfunc::getRecordIconAltText($row,$table);
-               $recTitle = t3lib_BEfunc::getRecordTitle($table,$row);
-
                        // Incr. counter.
                $this->counter++;
 
                        // The icon with link
+               $alttext = t3lib_BEfunc::getRecordIconAltText($row,$table);
                $iconImg = t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'title="'.htmlspecialchars($alttext).'"'.($indent ? ' style="margin-left: '.$indent.'px;"' : ''));
                $theIcon = $this->clickMenuEnabled ? $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg,$table,$row['uid']) : $iconImg;
 
@@ -595,21 +592,7 @@ class localRecordList extends recordList {
                $theData = Array();
                foreach($this->fieldArray as $fCol)     {
                        if ($fCol==$titleCol)   {
-                               if ($GLOBALS['TCA'][$table]['ctrl']['label_alt'] && ($GLOBALS['TCA'][$table]['ctrl']['label_alt_force'] || !strcmp($row[$fCol],'')))    {
-                                       $altFields=t3lib_div::trimExplode(',',$GLOBALS['TCA'][$table]['ctrl']['label_alt'],1);
-                                       $tA=array();
-                                       if ($row[$fCol])        {
-                                               $tA[] = t3lib_BEfunc::getProcessedValueExtra($table,$fCol,$row[$fCol],$GLOBALS['BE_USER']->uc['titleLen'],$row['uid']);
-                                       }
-                                       while(list(,$fN)=each($altFields))      {
-                                               $t = t3lib_BEfunc::getProcessedValueExtra($table,$fN,$row[$fN],$GLOBALS['BE_USER']->uc['titleLen'],$row['uid']);
-                                               if($t)  { $tA[] = $t; }
-                                       }
-                                       if ($GLOBALS['TCA'][$table]['ctrl']['label_alt_force']) { $t=implode(', ',$tA); }
-                                       if ($t) { $recTitle = $t; }
-                               } else {
-                                       $recTitle = t3lib_BEfunc::getProcessedValueExtra($table,$fCol,$row[$fCol],$GLOBALS['BE_USER']->uc['titleLen'],$row['uid']);
-                               }
+                               $recTitle = t3lib_BEfunc::getRecordTitle($table,$row,FALSE,TRUE);
                                $theData[$fCol] = $this->linkWrapItems($table,$row['uid'],$recTitle,$row);
                        } elseif ($fCol=='pid') {
                                $theData[$fCol]=$row[$fCol];
index 58a5a3a..8cb0a13 100755 (executable)
@@ -781,9 +781,7 @@ class recordHistory {
                $out = $table.':'.$uid;
                if ($labelField = $TCA[$table]['ctrl']['label'])        {
                        $record = t3lib_BEfunc::getRecordRaw($table, 'uid='.intval($uid));
-                       if (strlen(trim($record[$labelField]))) {
-                               $out .= ' ('.htmlspecialchars($record[$labelField]).')';
-                       }
+                       $out .= ' ('.t3lib_BEfunc::getRecordTitle($table, $record, TRUE).')';
                }
                return $out;
        }
index 6d37193..55b099a 100755 (executable)
@@ -291,7 +291,7 @@ class SC_move_el {
 
                                // Headerline: Icon, record title:
                        $hline = t3lib_iconWorks::getIconImage($this->table,$elRow,$BACK_PATH,' id="c-recIcon" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($elRow,$this->table)).'"');
-                       $hline.= t3lib_BEfunc::getRecordTitle($this->table,$elRow,1);
+                       $hline.= t3lib_BEfunc::getRecordTitle($this->table,$elRow,TRUE);
 
                                // Make-copy checkbox (clicking this will reload the page with the GET var makeCopy set differently):
                        $onClick = 'window.location.href=\''.t3lib_div::linkThisScript(array('makeCopy'=>!$this->makeCopy)).'\';';
@@ -322,11 +322,11 @@ class SC_move_el {
                                                        if ($BE_USER->isInWebMount($pidPageInfo['pid'],$this->perms_clause))    {
                                                                $code.= '<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('uid'=>intval($pageinfo['pid']),'moveUid'=>$this->moveUid))).'">'.
                                                                        '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/i/pages_up.gif','width="18" height="16"').' alt="" />'.
-                                                                       t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,1).
+                                                                       t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
                                                                        '</a><br />';
                                                        } else {
                                                                $code.= t3lib_iconWorks::getIconImage('pages',$pidPageInfo,$BACK_PATH,'').
-                                                                       t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,1).
+                                                                       t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
                                                                        '<br />';
                                                        }
                                                }
@@ -360,7 +360,7 @@ class SC_move_el {
 
                                                // Headerline for the parent page: Icon, record title:
                                        $hline = t3lib_iconWorks::getIconImage('pages',$pageinfo,$BACK_PATH,' title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($pageinfo,'pages')).'"');
-                                       $hline.= t3lib_BEfunc::getRecordTitle('pages',$pageinfo,1);
+                                       $hline.= t3lib_BEfunc::getRecordTitle('pages',$pageinfo,TRUE);
 
                                                // Load SHARED page-TSconfig settings and retrieve column list from there, if applicable:
                                        $modTSconfig_SHARED = t3lib_BEfunc::getModTSconfig($this->page_id,'mod.SHARED');                // SHARED page-TSconfig settings.
@@ -380,11 +380,11 @@ class SC_move_el {
                                                        if ($BE_USER->isInWebMount($pidPageInfo['pid'],$this->perms_clause))    {
                                                                $code.= '<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('uid'=>intval($pageinfo['pid']),'moveUid'=>$this->moveUid))).'">'.
                                                                        '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/i/pages_up.gif','width="18" height="16"').' alt="" />'.
-                                                                       t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,1).
+                                                                       t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
                                                                        '</a><br />';
                                                        } else {
                                                                $code.= t3lib_iconWorks::getIconImage('pages',$pidPageInfo,$BACK_PATH,'').
-                                                                       t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,1).
+                                                                       t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
                                                                        '<br />';
                                                        }
                                                }
index c1925ca..068b8c4 100755 (executable)
@@ -384,7 +384,7 @@ class tx_cms_layout extends recordList {
                $RTE = $GLOBALS['BE_USER']->isRTE();
                $lMarg=1;
                $showHidden = $this->tt_contentConfig['showHidden']?'':t3lib_BEfunc::BEenableFields('tt_content');
-               $pageTitleParamForAltDoc='&recTitle='.rawurlencode(t3lib_BEfunc::getRecordTitle('pages',t3lib_BEfunc::getRecordWSOL('pages',$id),1));
+               $pageTitleParamForAltDoc='&recTitle='.rawurlencode(t3lib_BEfunc::getRecordTitle('pages',t3lib_BEfunc::getRecordWSOL('pages',$id),TRUE));
 
                        // Get labels for CTypes and tt_content element fields in general:
                $this->CType_labels =array();
index de9ec56..2772070 100644 (file)
@@ -248,7 +248,7 @@ class SC_db_new_content_el {
 
                        $elRow = t3lib_BEfunc::getRecordWSOL('pages',$this->id);
                        $hline = t3lib_iconWorks::getIconImage('pages',$elRow,$BACK_PATH,' title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($elRow,'pages')).'" align="top"');
-                       $hline.= t3lib_BEfunc::getRecordTitle('pages',$elRow,1);
+                       $hline.= t3lib_BEfunc::getRecordTitle('pages',$elRow,TRUE);
                        $this->content.=$this->doc->section('',$hline,0,1);
                        $this->content.=$this->doc->spacer(10);
 
index 59c2b3b..6af696c 100755 (executable)
@@ -785,7 +785,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                <tr class="bgColor4">
                                        <td><strong>'.$LANG->getLL('makeconfig_record',1).'</strong></td>
                                        <td>'.t3lib_iconworks::getIconImage($tName,$rec,$GLOBALS['BACK_PATH'],' align="top"').
-                                               t3lib_BEfunc::getRecordTitle($tName,$rec,1).
+                                               t3lib_BEfunc::getRecordTitle($tName,$rec,TRUE).
                                                '<input type="hidden" name="tx_impexp[record][]" value="'.htmlspecialchars($tName.':'.$rUid).'" /></td>
                                </tr>';
                        }
@@ -806,7 +806,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                if ($GLOBALS['BE_USER']->check('tables_select',$tName)) {
                                        $rec = t3lib_BEfunc::getRecordWSOL('pages', $rParts[1]);
                                        $tblList.='Table "'.$tName.'" from '.t3lib_iconworks::getIconImage('pages',$rec,$GLOBALS['BACK_PATH'],' align="top"').
-                                       t3lib_BEfunc::getRecordTitle('pages',$rec,1).
+                                       t3lib_BEfunc::getRecordTitle('pages',$rec,TRUE).
                                        '<input type="hidden" name="tx_impexp[list][]" value="'.htmlspecialchars($ref).'" /><br/>';
                                }
                        }
index f14433e..fb4dd15 100755 (executable)
@@ -224,7 +224,7 @@ class tx_sysaction extends mod_user_task {
                                                                <td nowrap class="bgColor4">'.
                                                                        '<a href="'.$this->backPath.'alt_doc.php?returnUrl='.rawurlencode(t3lib_div::getIndpEnv("REQUEST_URI")).'&edit['.$el["table"].']['.$el["id"].']=edit">'.
                                                                        t3lib_iconworks::getIconImage($el["table"],$dbAnalysis->results[$el["table"]][$el["id"]],$this->backPath,'hspace="2" align="top" title="'.htmlspecialchars($path).'"').
-                                                                       t3lib_BEfunc::getRecordTitle($el["table"],$dbAnalysis->results[$el["table"]][$el["id"]],1).'</a></td>
+                                                                       t3lib_BEfunc::getRecordTitle($el["table"],$dbAnalysis->results[$el["table"]][$el["id"]],TRUE).'</a></td>
                                                                </tr>';
                                                }
                                                $actionContent = '<table border=0 cellpadding=0 cellspacing=2>'.implode("",$lines).'</table>';
index 2adfc3e..eb1ce8a 100755 (executable)
@@ -383,7 +383,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                        // Element:
                $record = t3lib_BEfunc::getRecord($this->table,$this->uid);
                $recordIcon = t3lib_iconWorks::getIconImage($this->table,$record,$this->doc->backPath,'class="absmiddle"');
-               $recTitle = t3lib_BEfunc::getRecordTitle($this->table,$record,1);
+               $recTitle = t3lib_BEfunc::getRecordTitle($this->table,$record,TRUE);
 
                        // Display versions:
                $content.='
@@ -424,7 +424,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                                                '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/insert4.gif','width="14" height="14"').' alt="" title="Publish page AND content! - AND ALL SUBPAGES!" />'.
                                                '</a>' : '') */ : '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/blinkarrow_left.gif','width="5" height="9"').' alt="" title="CURRENT ONLINE VERSION!"/>').'</td>
                                        <td nowrap="nowrap">'.$adminLinks.'</td>
-                                       <td nowrap="nowrap">'.t3lib_BEfunc::getRecordTitle($this->table,$row,1).'</td>
+                                       <td nowrap="nowrap">'.t3lib_BEfunc::getRecordTitle($this->table,$row,TRUE).'</td>
                                        <td>'.$row['uid'].'</td>
                                        <td>'.$row['t3ver_oid'].'</td>
                                        <td>'.$row['t3ver_id'].'</td>
@@ -512,7 +512,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                                                                <td>'.$this->adminLinks($tN,$subrow).'</td>
                                                                <td>'.$subrow['uid'].'</td>
                                                                '.($ownVer>1 ? '<td style="font-weight: bold; background-color: yellow;"><a href="index.php?table='.rawurlencode($tN).'&uid='.$subrow['uid'].'">'.($ownVer-1).'</a></td>' : '<td></td>').'
-                                                               <td width="98%">'.t3lib_BEfunc::getRecordTitle($tN,$subrow,1).'</td>
+                                                               <td width="98%">'.t3lib_BEfunc::getRecordTitle($tN,$subrow,TRUE).'</td>
                                                        </tr>';
 
                                                if ($tN == 'pages' && $c<100)   {