Index: t3lib/class.t3lib_frontendedit.php =================================================================== --- t3lib/class.t3lib_frontendedit.php (revision 8878) +++ t3lib/class.t3lib_frontendedit.php (working copy) @@ -154,7 +154,7 @@ if ($editClass) { $edit = t3lib_div::getUserObj($editClass); if (is_object($edit)) { - $content = $edit->editIcons($content, $params, $conf, $currentRecord, $dataArray, $addURLParamStr, $table, $editUid, $fieldList); + $content = $edit->editIcons($content, $params, $conf, $currentRecord, $dataArray, $addUrlParamStr, $table, $editUid, $fieldList); } } } Index: t3lib/class.t3lib_tceforms_inline.php =================================================================== --- t3lib/class.t3lib_tceforms_inline.php (revision 8878) +++ t3lib/class.t3lib_tceforms_inline.php (working copy) @@ -600,7 +600,7 @@ $enabledControls = $config['appearance']['enabledControls']; // Hook: Can disable/enable single controls for specific child records: foreach ($this->hookObjects as $hookObj) { - $hookObj->renderForeignRecordHeaderControl_preProcess($parentUid, $foreign_table, $rec, $config, $isVirtual, $enabledControls); + $hookObj->renderForeignRecordHeaderControl_preProcess($parentUid, $foreign_table, $rec, $config, FALSE, $enabledControls); } // Icon to visualize that a required field is nested in this inline level: @@ -715,7 +715,7 @@ // Hook: Post-processing of single controls for specific child records: foreach ($this->hookObjects as $hookObj) { - $hookObj->renderForeignRecordHeaderControl_postProcess($parentUid, $foreign_table, $rec, $config, $isVirtual, $cells); + $hookObj->renderForeignRecordHeaderControl_postProcess($parentUid, $foreign_table, $rec, $config, FALSE, $cells); } // Compile items into a DIV-element: return ' @@ -826,7 +826,7 @@ $PA['fieldTSConfig'] = $this->fObj->setTSconfig($foreign_table,array(),$foreign_selector); $config = $PA['fieldConf']['config']; - if(!$disabled) { + if (TRUE) { // Create option tags: $opt = array(); $styleAttrValue = ''; @@ -845,7 +845,11 @@ // Put together the selector box: $selector_itemListStyle = isset($config['itemListStyle']) ? ' style="'.htmlspecialchars($config['itemListStyle']).'"' : ' style="'.$this->fObj->defaultMultipleSelectorStyle.'"'; $size = intval($conf['size']); - $size = $conf['autoSizeMax'] ? t3lib_div::intInRange(count($itemArray)+1,t3lib_div::intInRange($size,1),$conf['autoSizeMax']) : $size; + $size = $conf['autoSizeMax'] + ? t3lib_div::intInRange( + 1, t3lib_div::intInRange($size, 1), $conf['autoSizeMax'] + ) + : $size; $onChange = "return inline.importNewRecord('" . $this->inlineNames['object']. self::Structure_Separator . $conf['foreign_table'] . "')"; $item = ' '; $this->queryConfig = $queryConfig; -//modifyHTMLColor($color,$R,$G,$B) + return $codeArr; } @@ -846,6 +846,7 @@ $from_table_Arr[0] = $fieldSetup['foreign_table']; } $counter = 0; + $webMountPageTree = ''; while (list(, $from_table) = each($from_table_Arr)) { if (($useTablePrefix && !$dontPrefixFirstTable && $counter!=1) || $counter==1) { $tablePrefix = $from_table.'_'; @@ -1008,7 +1009,7 @@ $out=''; foreach ($this->fields as $key => $value) { - if (!$fieldValue['exclude'] || $GLOBALS['BE_USER']->check('non_exclude_fields', $this->table.':'.$key)) { + if ($GLOBALS['BE_USER']->check('non_exclude_fields', $this->table.':'.$key)) { $label = $this->fields[$key]['label']; $label_alt = $this->fields[$key]['label_alt']; $out .= ''; @@ -1458,6 +1459,7 @@ if (!$GLOBALS['BE_USER']->isAdmin() && $GLOBALS['TYPO3_CONF_VARS']['BE']['lockBeUserToDBmounts']) { $webMounts = $GLOBALS['BE_USER']->returnWebmounts(); $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1); + $webMountPageTree = ''; foreach($webMounts as $key => $val) { if ($webMountPageTree) { $webMountPageTreePrefix = ','; Index: t3lib/class.t3lib_tcemain.php =================================================================== --- t3lib/class.t3lib_tcemain.php (revision 8878) +++ t3lib/class.t3lib_tcemain.php (working copy) @@ -1739,11 +1739,11 @@ $newFiles = implode(',', $dbAnalysis->getValueArray()); list(,,$recFieldName) = explode(':', $recFID); if ($currentFilesForHistory != $newFiles) { - $this->mmHistoryRecords[$currentTable . ':' . $id]['oldRecord'][$recFieldName] = $currentFilesForHistory; - $this->mmHistoryRecords[$currentTable . ':' . $id]['newRecord'][$recFieldName] = $newFiles; + $this->mmHistoryRecords[$table . ':' . $id]['oldRecord'][$recFieldName] = $currentFilesForHistory; + $this->mmHistoryRecords[$table . ':' . $id]['newRecord'][$recFieldName] = $newFiles; } else { - $this->mmHistoryRecords[$currentTable . ':' . $id]['oldRecord'][$currentField] = ''; - $this->mmHistoryRecords[$currentTable . ':' . $id]['newRecord'][$currentField] = ''; + $this->mmHistoryRecords[$table . ':' . $id]['oldRecord'][$currentField] = ''; + $this->mmHistoryRecords[$table . ':' . $id]['newRecord'][$currentField] = ''; } } else { $this->dbAnalysisStore[] = array($dbAnalysis, $tcaFieldConf['MM'], $id, 0); // This will be traversed later to execute the actions @@ -3513,7 +3513,7 @@ if ($TCA[$table]['ctrl']['cruser_id']) { $newVersion_placeholderFieldArray[$TCA[$table]['ctrl']['cruser_id']] = $this->userid; } - if ($TCA[$table]['ctrl']['tstamp'] && count($fieldArray)) { + if ($TCA[$table]['ctrl']['tstamp']) { $newVersion_placeholderFieldArray[$TCA[$table]['ctrl']['tstamp']] = $GLOBALS['EXEC_TIME']; } @@ -4239,9 +4239,13 @@ foreach($files as $dat) { if (@is_file($dat['ID_absFile'])) { unlink ($dat['ID_absFile']); -#echo 'DELETE FlexFormFile:'.$dat['ID_absFile'].LF; } else { - $this->log($table,0,3,0,100,"Delete: Referenced file '".$dat['ID_absFile']."' that was supposed to be deleted together with it's record didn't exist"); + $this->log( + '', 0, 3, 0, 100, + 'Delete: Referenced file "' . $dat['ID_absFile'] . + '" that was supposed to be deleted together with ' . + 'its record did not exist.' + ); } } } Index: t3lib/class.t3lib_treeview.php =================================================================== --- t3lib/class.t3lib_treeview.php (revision 8878) +++ t3lib/class.t3lib_treeview.php (working copy) @@ -765,6 +765,8 @@ $c = $this->getDataCount($res); $crazyRecursionLimiter = 999; + $idH = array(); + // Traverse the records: while ($crazyRecursionLimiter>0 && $row = $this->getDataNext($res,$subCSSclass)) { $a++; Index: t3lib/class.t3lib_tsparser_ext.php =================================================================== --- t3lib/class.t3lib_tsparser_ext.php (revision 8878) +++ t3lib/class.t3lib_tsparser_ext.php (working copy) @@ -587,7 +587,7 @@ } $a=0; $c=count($keyArr); - static $i; + static $i = 0; foreach ($keyArr as $key => $value) { $HTML = ''; $a++; Index: typo3/alt_doc.php =================================================================== --- typo3/alt_doc.php (revision 8878) +++ typo3/alt_doc.php (working copy) @@ -629,6 +629,7 @@ $this->newC=0; $thePrevUid=''; $editForm=''; + $trData = NULL; // Traverse the GPvar edit array foreach($this->editconf as $table => $conf) { // Tables: