* Fixed bug #0000527: Title tag is added even if the page title was empty. Thanks...
[Packages/TYPO3.CMS.git] / typo3 / class.db_list.inc
index 66892be..d7f037d 100755 (executable)
@@ -1,22 +1,22 @@
 <?php
 /***************************************************************
 *  Copyright notice
-*  
-*  (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
+*
+*  (c) 1999-2004 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
-*  This script is part of the TYPO3 project. The TYPO3 project is 
+*  This script is part of the TYPO3 project. The TYPO3 project is
 *  free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
-* 
+*
 *  The GNU General Public License can be found at
 *  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license 
+*  A copy is found in the textfile GPL.txt and important notices to the license
 *  from the author is found in LICENSE.txt distributed with these scripts.
 *
-* 
+*
 *  This script is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -24,7 +24,7 @@
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
-/** 
+/**
  * Include file extending t3lib_recordList
  * Shared between Web>List (db_list.php) and Web>Page (sysext/cms/layout/db_layout.php)
  *
  * Revised for TYPO3 3.6 December/2003 by Kasper Skaarhoj
  * XHTML compliant
  *
- * @author     Kasper Skaarhoj <kasper@typo3.com>
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
  */
 /**
  * [CLASS/FUNCTION INDEX of SCRIPT]
  *
  *
  *
- *   84: class recordList extends t3lib_recordList 
- *  141:     function start($id,$table,$pointer,$search="",$levels="",$showLimit=0)    
- *  187:     function generateList()   
- *  234:     function getSearchBox($formFields=1)      
- *  277:     function showSysNotesForPage()    
+ *   84: class recordList extends t3lib_recordList
+ *  144:     function start($id,$table,$pointer,$search="",$levels="",$showLimit=0)
+ *  195:     function generateList()
+ *  242:     function getSearchBox($formFields=1)
+ *  286:     function showSysNotesForPage()
  *
  *              SECTION: Various helper functions
- *  357:     function setDispFields()  
- *  382:     function thumbCode($row,$table,$field)    
- *  395:     function makeQuery($table, $id, $addWhere="",$fieldList='*')      
- *  434:     function setTotalItems()  
- *  453:     function makeSearchString($table) 
- *  492:     function linkWrapTable($table,$code)      
- *  509:     function linkWrapItems($table,$uid,$code,$row)    
- *  536:     function listURL($altId='',$table=-1,$exclList='')        
- *  555:     function requestUri()     
- *  566:     function makeFieldList($table,$dontCheckUser=0)   
- *  605:     function getTreeObject($id,$depth,$perms_clause)  
+ *  363:     function setDispFields()
+ *  388:     function thumbCode($row,$table,$field)
+ *  401:     function makeQueryArray($table, $id, $addWhere="",$fieldList='*')
+ *  443:     function setTotalItems($queryParts)
+ *  459:     function makeSearchString($table)
+ *  498:     function linkWrapTable($table,$code)
+ *  515:     function linkWrapItems($table,$uid,$code,$row)
+ *  578:     function listURL($altId='',$table=-1,$exclList='')
+ *  597:     function requestUri()
+ *  608:     function makeFieldList($table,$dontCheckUser=0)
+ *  648:     function getTreeObject($id,$depth,$perms_clause)
  *
  * TOTAL FUNCTIONS: 15
  * (This index is automatically created/updated by the extension "extdeveval")
  */
 
 
+
+
+
+
+
 
 
 
 
 /**
  * Child class for rendering of Web > List (not the final class. see class.db_list_extra)
- * 
- * @author     Kasper Skaarhoj <kasper@typo3.com>
+ *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage core
  * @see localRecordList
@@ -85,24 +85,26 @@ class recordList extends t3lib_recordList {
 
                // External, static:
        var $tableList='';                                              // Specify a list of tables which are the only ones allowed to be displayed.
-       var $returnUrl='';                                              // Return URL 
+       var $returnUrl='';                                              // Return URL
        var $thumbs = 0;                                                // Boolean. Thumbnails on records containing files (pictures)
        var $itemsLimitPerTable = 20;                   // default Max items shown per table in "multi-table mode", may be overridden by tables.php
        var $itemsLimitSingleTable = 100;               // default Max items shown per table in "single-table mode", may be overridden by tables.php
        var $widthGif = '<img src="clear.gif" width="1" height="4" hspace="160" alt="" />';
        var $script = 'db_list.php';                    // Current script name
        var $allFields=0;                                               // Indicates if all available fields for a user should be selected or not.
-       
+       var $localizationView=FALSE;                    // Whether to show localization view or not.
+
                // Internal, static: GPvar:
        var $csvOutput=FALSE;                   // If set, csvList is outputted.
        var $sortField;                                 // Field, to sort list by
        var $sortRev;                                   // Field, indicating to sort in reverse order.
        var $displayFields;                             // Array, containing which fields to display in extended mode
        var $duplicateField;                    // String, can contain the field name from a table which must have duplicate values marked.
-       
+
                // Internal, static:
        var $id;                                                // Page id
        var $table='';                                  // Tablename if single-table mode
+       var $listOnlyInSingleTableMode=FALSE;   // If true, records are listed only if a specific table is selected.
        var $firstElementNumber=0;              // Pointer for browsing list
        var $searchString='';                   // Search string
        var $searchLevels='';                   // Levels to search down.
@@ -110,79 +112,85 @@ class recordList extends t3lib_recordList {
        var $pidSelect='';                              // List of ids from which to select/search etc. (when search-levels are set high). See start()
        var $perms_clause='';                   // Page select permissions
        var $calcPerms=0;                               // Some permissions...
+       var $clickTitleMode = '';               // Mode for what happens when a user clicks the title of a record.
+       var $modSharedTSconfig = array();               // Shared module configuration, used by localization features
 
                // Internal, dynamic:
        var $JScode = '';                               // JavaScript code accumulation
-       var $HTMLcode = '';                             // HTML output 
+       var $HTMLcode = '';                             // HTML output
        var $iLimit=0;                                  // "LIMIT " in SQL...
        var $eCounter=0;                                // Counting the elements no matter what...
        var $totalItems='';                             // Set to the total number of items for a table when selecting.
        var $recPath_cache=array();             // Cache for record path
        var $setFields=array();                 // Fields to display for the current table
        var $currentTable = array();    // Used for tracking next/prev uids
-       var $temp_countQ='';                    // Stores temporary count(*) query
        var $duplicateStack=array();    // Used for tracking duplicate values of fields
-       
+
 
 
 
 
        /**
         * Initializes the list generation
-        * 
+        *
         * @param       integer         Page id for which the list is rendered. Must be >= 0
         * @param       string          Tablename - if extended mode where only one table is listed at a time.
         * @param       integer         Browsing pointer.
         * @param       string          Search word, if any
         * @param       integer         Number of levels to search down the page tree
         * @param       integer         Limit of records to be listed.
-        * @return      void            
+        * @return      void
         */
        function start($id,$table,$pointer,$search="",$levels="",$showLimit=0)  {
                global $TCA;
-               
-                       // Setting internal variables:                  
+
+                       // Setting internal variables:
                $this->id=intval($id);                                  // sets the parent id
                if ($TCA[$table])       $this->table=$table;            // Setting single table mode, if table exists:
                $this->firstElementNumber=$pointer;
                $this->searchString=trim($search);
                $this->searchLevels=trim($levels);
                $this->showLimit=t3lib_div::intInRange($showLimit,0,10000);
-               
+
                        // Setting GPvars:
                $this->csvOutput = t3lib_div::_GP('csv') ? TRUE : FALSE;
                $this->sortField = t3lib_div::_GP('sortField');
                $this->sortRev = t3lib_div::_GP('sortRev');
                $this->displayFields = t3lib_div::_GP('displayFields');
                $this->duplicateField = t3lib_div::_GP('duplicateField');
-               
+
                        // If thumbnails are disabled, set the "notfound" icon as default:
                if (!$GLOBALS['TYPO3_CONF_VARS']['GFX']['thumbnails'])  {
                        $this->thumbScript='gfx/notfound_thumb.gif';
                }
 
                        // Init dynamic vars:
-               $this->counter=0;       
+               $this->counter=0;
                $this->JScode='';
                $this->HTMLcode='';
-               
+
                        // Set select levels:
                $sL=intval($this->searchLevels);
                $this->perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
                if ($sL>0)      {
                        $tree = $this->getTreeObject($id,$sL,$this->perms_clause);
-                       $this->pidSelect = 'pid IN ('.implode($tree->ids,',').')';
+                       $this->pidSelect = 'pid IN ('.implode(',',$tree->ids).')';
                } else {
                        $this->pidSelect = 'pid='.intval($id);
                }
+
+                       // Initialize languages:
+               if ($this->localizationView)    {
+                       $this->initializeLanguages();
+               }
        }
 
        /**
         * Traverses the table(s) to be listed and renders the output code for each:
         * The HTML is accumulated in $this->HTMLcode
         * Finishes off with a stopper-gif
-        * 
-        * @return      void            
+        *
+        * @return      void
         */
        function generateList() {
                global $TCA;
@@ -190,10 +198,10 @@ class recordList extends t3lib_recordList {
                        // Traverse the TCA table array:
                reset($TCA);
                while (list($tableName)=each($TCA))     {
-                       
+
                                // Checking if the table should be rendered:
                        if ((!$this->table || $tableName==$this->table) && (!$this->tableList || t3lib_div::inList($this->tableList,$tableName)) && $GLOBALS['BE_USER']->check('tables_select',$tableName))     {               // Checks that we see only permitted/requested tables:
-               
+
                                        // Load full table definitions:
                                t3lib_div::loadTCA($tableName);
 
@@ -218,7 +226,7 @@ class recordList extends t3lib_recordList {
                                } else {
                                        $fields = array();
                                }
-                               
+
                                        // Finally, render the list:
                                $this->HTMLcode.=$this->getTable($tableName, $this->id,implode(',',$fields));
                        }
@@ -227,12 +235,12 @@ class recordList extends t3lib_recordList {
 
        /**
         * Creates the search box
-        * 
+        *
         * @param       boolean         If true, the search box is wrapped in its own form-tags
         * @return      string          HTML for the search box
         */
        function getSearchBox($formFields=1)    {
-               
+
                        // Setting form-elements, if applicable:
                $formElements=array('','');
                if ($formFields)        {
@@ -246,11 +254,11 @@ class recordList extends t3lib_recordList {
                        $opt[] = '<option value="'.$kv.'"'.($kv==intval($this->searchLevels)?' selected="selected"':'').'>'.htmlspecialchars($label).'</option>';
                }
                $lMenu = '<select name="search_levels">'.implode('',$opt).'</select>';
-               
+
                        // Table with the search box:
                $content.= '
                        '.$formElements[0].'
-                       
+
                                <!--
                                        Search box:
                                -->
@@ -263,51 +271,49 @@ class recordList extends t3lib_recordList {
                                        <tr>
                                                <td colspan="3">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showRecords',1).':<input type="text" name="showLimit" value="'.htmlspecialchars($this->showLimit?$this->showLimit:'').'"'.$GLOBALS['SOBE']->doc->formWidth(4).' /></td>
                                        </tr>
-                               </table>                        
+                               </table>
                        '.$formElements[1];
+               $content.=t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'list_searchbox', $GLOBALS['BACK_PATH'],'|<br/>');
                return $content;
        }
 
        /**
         * Creates the display of sys_notes for the page.
         * Relies on the "sys_note" extension to be loaded.
-        * 
+        *
         * @return      string          HTML for the sys-notes (if any)
         */
        function showSysNotesForPage()  {
                global $TCA;
-               
+
                $out='';
 
                        // Checking if extension is loaded:
                if (!t3lib_extMgm::isLoaded('sys_note'))        return '';
 
                        // Create query for selecting the notes:
-               $delClause = t3lib_BEfunc::deleteClause('sys_note');
-               $query = 'SELECT * FROM sys_note where pid in ('.$this->id.') AND (!personal OR cruser="'.$GLOBALS['BE_USER']->user['uid'].'")'.$delClause;
-               
+               $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*','sys_note','pid IN ('.$this->id.') AND (!personal OR cruser="'.intval($GLOBALS['BE_USER']->user['uid']).'")'.t3lib_BEfunc::deleteClause('sys_note'));
+
                        // Executing query:
-               $result = mysql(TYPO3_db,$query);
-               if (mysql_error()) {echo mysql_error(); debug($query);}
-               $dbCount = mysql_num_rows($result);
-               
+               $dbCount = $GLOBALS['TYPO3_DB']->sql_num_rows($result);
+
                        // If some notes were found, render them:
                if ($dbCount)   {
                        $cat = array();
-                       
+
                                // Load full table description:
                        t3lib_div::loadTCA('sys_note');
-                       
+
                                // Traverse note-types and get labels:
                        if ($TCA['sys_note'] && $TCA['sys_note']['columns']['category'] && is_array($TCA['sys_note']['columns']['category']['config']['items']))        {
                                foreach($TCA['sys_note']['columns']['category']['config']['items'] as $el)      {
                                        $cat[$el[1]]=$GLOBALS['LANG']->sL($el[0]);
                                }
                        }
-                       
+
                                // For each note found, make rendering:
-                       while($row=mysql_fetch_assoc($result))  {
-                       
+                       while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result))    {
+
                                        // Create content:
                                $iconImg = t3lib_iconWorks::getIconImage('sys_note',$row,$this->backPath,'');
                                $subject = htmlspecialchars($row['subject']);
@@ -315,11 +321,11 @@ class recordList extends t3lib_recordList {
                                $fields['Author:'] = htmlspecialchars($row['author'].($row['email'] && $row['author'] ? ', ':'').$row['email']);
                                $fields['Category:'] = htmlspecialchars($cat[$row['category']]);
                                $fields['Note:'] = nl2br(htmlspecialchars($row['message']));
-                               
+
                                        // Compile content:
                                $out.='
 
-                       
+
                                <!--
                                        Sys-notes for the db_list.php:
                                -->
@@ -351,8 +357,8 @@ class recordList extends t3lib_recordList {
        /**
         * Setting the field names to display in extended list.
         * Sets the internal variable $this->setFields
-        * 
-        * @return      void            
+        *
+        * @return      void
         */
        function setDispFields()        {
 
@@ -366,14 +372,14 @@ class recordList extends t3lib_recordList {
                        $dispFields[$tKey]=$this->displayFields[$tKey];
                        $GLOBALS['BE_USER']->pushModuleData('db_list.php/displayFields',$dispFields);
                }
-                       
+
                        // Setting result:
                $this->setFields=$dispFields;
        }
 
        /**
         * Create thumbnail code for record/field
-        * 
+        *
         * @param       array           Record array
         * @param       string          Table (record is from)
         * @param       string          Field name for which thumbsnail are to be rendered.
@@ -384,15 +390,15 @@ class recordList extends t3lib_recordList {
        }
 
        /**
-        * Returns the SQL-query to select the records from a table $table with pid = $id
-        * 
+        * Returns the SQL-query array to select the records from a table $table with pid = $id
+        *
         * @param       string          Table name
         * @param       integer         Page id (NOT USED! $this->pidSelect is used instead)
         * @param       string          Additional part for where clause
         * @param       string          Field list to select, * for all (for "SELECT [fieldlist] FROM ...")
-        * @return      string          Returns query.
+        * @return      array           Returns query array
         */
-       function makeQuery($table, $id, $addWhere="",$fieldList='*')    {
+       function makeQueryArray($table, $id, $addWhere="",$fieldList='*')       {
                global $TCA;
 
                        // Set ORDER BY:
@@ -403,59 +409,59 @@ class recordList extends t3lib_recordList {
                                if ($this->sortRev)     $orderBy.=' DESC';
                        }
                }
-               
+
                        // Set LIMIT:
-               $limit = ($this->iLimit) ? 'LIMIT '.($this->firstElementNumber ? ($this->firstElementNumber).',' : '' ).($this->iLimit+1) : '';
-               
+               $limit = $this->iLimit ? ($this->firstElementNumber ? $this->firstElementNumber.',' : '').($this->iLimit+1) : '';
+
                        // Filtering on displayable pages (permissions):
                $pC = ($table=='pages' && $this->perms_clause)?' AND '.$this->perms_clause:'';
-               
+
                        // Adding search constraints:
                $search = $this->makeSearchString($table);
 
-                       // Compiling query:
-               $query = sprintf('SELECT '.$fieldList.' FROM %s WHERE '.$this->pidSelect.' %s %s %s %s %s %s',
-                               $table, $pC, t3lib_BEfunc::deleteClause($table), $addWhere, $search, $orderBy, $limit);
-                               
-                       // Make same query, but for counting records:
-               $this->temp_countQ = sprintf('SELECT count(*) FROM %s WHERE '.$this->pidSelect.' %s %s %s %s',
-                               $table, $pC, t3lib_BEfunc::deleteClause($table), $addWhere, $search);
+                       // Compiling query array:
+               $queryParts = array(
+                       'SELECT' => $fieldList,
+                       'FROM' => $table,
+                       'WHERE' => $this->pidSelect.' '.$pC.t3lib_BEfunc::deleteClause($table).' '.$addWhere.' '.$search,
+                       'GROUPBY' => '',
+                       'ORDERBY' => $GLOBALS['TYPO3_DB']->stripOrderBy($orderBy),
+                       'LIMIT' => $limit
+               );
 
                        // Return query:
-               return $query;
+               return $queryParts;
        }
 
        /**
-        * Based on $this->temp_countQ (query for selecting count(*) from a table) it will select the number of records and set the value in $this->totalItems
-        * 
-        * @return      void            
-        * @see makeQuery()
+        * Based on input query array (query for selecting count(*) from a table) it will select the number of records and set the value in $this->totalItems
+        *
+        * @param       array           Query array
+        * @return      void
+        * @see makeQueryArray()
         */
-       function setTotalItems()        {
-               $result = mysql(TYPO3_db,$this->temp_countQ);
-               if (mysql_error())      {
-                       echo '<hr />
-                       <strong>MySQL error:</strong> '.mysql_error().'<br />
-                       <strong>Query:</strong> '.$this->temp_countQ.'<br />
-                       <hr />
-                       ';
-               }
-               list($rCount) = mysql_fetch_row($result);
+       function setTotalItems($queryParts)     {
+               $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                                       'count(*)',
+                                       $queryParts['FROM'],
+                                       $queryParts['WHERE']
+                               );
+               list($rCount) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
                $this->totalItems = $rCount;
        }
 
        /**
         * Creates part of query for searching after a word ($this->searchString) fields in input table
-        * 
+        *
         * @param       string          Table, in which the fields are being searched.
         * @return      string          Returns part of WHERE-clause for searching, if applicable.
         */
        function makeSearchString($table)       {
                global $TCA;
-               
+
                        // Make query, only if table is valid and a search string is actually defined:
                if ($TCA[$table] && $this->searchString)        {
-               
+
                                // Loading full table description - we need to traverse fields:
                        t3lib_div::loadTCA($table);
 
@@ -469,12 +475,12 @@ class recordList extends t3lib_recordList {
                                        $sfields[]=$fieldName;
                                }
                        }
-                       
+
                                // If search-fields were defined (and there always are) we create the query:
                        if (count($sfields))    {
-                               $like=' LIKE "%'.addslashes($this->searchString).'%"';          // Free-text searching...
+                               $like=' LIKE "%'.$GLOBALS['TYPO3_DB']->quoteStr($this->searchString, $table).'%"';              // Free-text searching...
                                $queryPart = ' AND ('.implode($like.' OR ',$sfields).$like.')';
-                               
+
                                        // Return query:
                                return $queryPart;
                        }
@@ -484,7 +490,7 @@ class recordList extends t3lib_recordList {
        /**
         * Returns the title (based on $code) of a table ($table) with the proper link around. For headers over tables.
         * The link will cause the display of all extended mode or not for the table.
-        * 
+        *
         * @param       string          Table name
         * @param       string          Table label
         * @return      string          The linked table label
@@ -499,7 +505,7 @@ class recordList extends t3lib_recordList {
 
        /**
         * Returns the title (based on $code) of a record (from table $table) with the proper link around (that is for 'pages'-records a link to the level of that record...)
-        * 
+        *
         * @param       string          Table name
         * @param       integer         Item uid
         * @param       string          Item title (not htmlspecialchars()'ed yet)
@@ -507,27 +513,63 @@ class recordList extends t3lib_recordList {
         * @return      string          The item title. Ready for HTML output (is htmlspecialchars()'ed)
         */
        function linkWrapItems($table,$uid,$code,$row)  {
+               global $TCA, $LANG;
 
                        // If the title is blank, make a "no title" label:
                if (!strcmp($code,'')) {
-                       $code='<i>['.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.no_title',1).']</i> - '.htmlspecialchars(t3lib_BEfunc::getRecordTitle($table,$row));
+                       $code = '<i>['.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.no_title',1).']</i> - '.htmlspecialchars(t3lib_BEfunc::getRecordTitle($table,$row));
                } else {
-                       $code=htmlspecialchars(t3lib_div::fixed_lgd($code,$this->fixedL));
+                       $code = htmlspecialchars(t3lib_div::fixed_lgd_cs($code,$this->fixedL));
                }
-               
-                       // Output the label now:
-               if ($table=='pages')    {
-                       return '<a href="'.htmlspecialchars($this->listURL($uid,'')).'">'.$code.'</a>';
-               } else {
-                       return $code;
+
+               switch((string)$this->clickTitleMode)   {
+                       case 'edit':
+                                       // If the listed table is 'pages' we have to request the permission settings for each page:
+                               if ($table=='pages')    {
+                                       $localCalcPerms = $GLOBALS['BE_USER']->calcPerms(t3lib_BEfunc::getRecord('pages',$row['uid']));
+                                       $permsEdit = $localCalcPerms&2;
+                               } else {
+                                       $permsEdit = $this->calcPerms&16;
+                               }
+
+                                       // "Edit" link: ( Only if permissions to edit the page-record of the content of the parent page ($this->id)
+                               if ($permsEdit) {
+                                       $params='&edit['.$table.']['.$row['uid'].']=edit';
+                                       $code = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,'',-1)).'" title="'.$LANG->getLL('edit',1).'">'.
+                                                       $code.
+                                                       '</a>';
+                               }
+                       break;
+                       case 'show':
+                                       // "Show" link (only pages and tt_content elements)
+                               if ($table=='pages' || $table=='tt_content')    {
+                                       $code = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::viewOnClick($table=='tt_content'?$this->id.'#'.$row['uid']:$row['uid'])).'" title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.showPage',1).'">'.
+                                                       $code.
+                                                       '</a>';
+                               }
+                       break;
+                       case 'info':
+                               // "Info": (All records)
+                               $code = '<a href="#" onclick="'.htmlspecialchars('top.launchView(\''.$table.'\', \''.$row['uid'].'\'); return false;').'" title="'.$LANG->getLL('showInfo',1).'">'.
+                                       $code.
+                                       '</a>';
+                       break;
+                       default:
+                                       // Output the label now:
+                               if ($table=='pages')    {
+                                       $code = '<a href="'.htmlspecialchars($this->listURL($uid,'')).'">'.$code.'</a>';
+                               }
+                       break;
                }
+
+               return $code;
        }
 
        /**
         * Creates the URL to this script, including all relevant GPvars
         * Fixed GPvars are id, table, imagemode, returlUrl, search_field, search_levels and showLimit
         * The GPvars "sortField" and "sortRev" are also included UNLESS they are found in the $exclList variable.
-        * 
+        *
         * @param       string          Alternative id value. Enter blank string for the current id ($this->id)
         * @param       string          Tablename to display. Enter "-1" for the current table.
         * @param       string          Commalist of fields NOT to include ("sortField" or "sortRev")
@@ -549,7 +591,7 @@ class recordList extends t3lib_recordList {
 
        /**
         * Returns "requestUri" - which is basically listURL
-        * 
+        *
         * @return      string          Content of ->listURL()
         */
        function requestUri()   {
@@ -558,29 +600,29 @@ class recordList extends t3lib_recordList {
 
        /**
         * Makes the list of fields to select for a table
-        * 
+        *
         * @param       string          Table name
         * @param       boolean         If set, users access to the field (non-exclude-fields) is NOT checked.
         * @return      array           Array, where values are fieldnames to include in query
         */
        function makeFieldList($table,$dontCheckUser=0) {
                global $TCA,$BE_USER;
-               
+
                        // Init fieldlist array:
                $fieldListArr = array();
 
-                       // Check table:         
+                       // Check table:
                if (is_array($TCA[$table]))     {
                        t3lib_div::loadTCA($table);
 
                                // Traverse configured columns and add them to field array, if available for user.
                        foreach($TCA[$table]['columns'] as $fN => $fieldValue)  {
-                               if ($dontCheckUser || 
+                               if ($dontCheckUser ||
                                        ((!$fieldValue['exclude'] || $BE_USER->check('non_exclude_fields',$table.':'.$fN)) && $fieldValue['config']['type']!='passthrough'))    {
                                        $fieldListArr[]=$fN;
                                }
                        }
-                       
+
                                // Add special fields:
                        if ($dontCheckUser || $BE_USER->isAdmin())      {
                                $fieldListArr[]='uid';
@@ -589,6 +631,7 @@ class recordList extends t3lib_recordList {
                                if ($TCA[$table]['ctrl']['crdate'])     $fieldListArr[]=$TCA[$table]['ctrl']['crdate'];
                                if ($TCA[$table]['ctrl']['cruser_id'])  $fieldListArr[]=$TCA[$table]['ctrl']['cruser_id'];
                                if ($TCA[$table]['ctrl']['sortby'])     $fieldListArr[]=$TCA[$table]['ctrl']['sortby'];
+                               if ($TCA[$table]['ctrl']['versioning']) $fieldListArr[]='t3ver_id';
                        }
                }
                return $fieldListArr;
@@ -596,7 +639,7 @@ class recordList extends t3lib_recordList {
 
        /**
         * Creates an instance of t3lib_pageTree which will select a page tree to $depth and return the object. In that object we will find the ids of the tree.
-        * 
+        *
         * @param       integer         Page id.
         * @param       integer         Depth to go down.
         * @param       string          Select clause
@@ -613,7 +656,6 @@ class recordList extends t3lib_recordList {
                $tree->ids[]=$id;
                return $tree;
        }
-
 }