Only in typo3_src-4.3.3/typo3/sysext/cms/tslib: .DS_Store diff -ru typo3_src-4.3.3/typo3/sysext/cms/tslib/class.tslib_content.php typo3_src-4.3.3_patched/typo3/sysext/cms/tslib/class.tslib_content.php --- typo3_src-4.3.3/typo3/sysext/cms/tslib/class.tslib_content.php 2010-04-09 10:51:38.000000000 +0200 +++ typo3_src-4.3.3_patched/typo3/sysext/cms/tslib/class.tslib_content.php 2010-07-22 07:50:06.000000000 +0200 @@ -7906,9 +7906,12 @@ if (!count($dataArr)) { $dataArr = $this->data; } - + if(isset($conf) && is_array($conf)){ // Delegate rendering of the edit panel to the t3lib_frontendedit class. - $content = $GLOBALS['BE_USER']->frontendEdit->displayEditIcons($content, $params, $conf, $currentRecord, $dataArr, $addURLParamStr); + $content = $GLOBALS['BE_USER']->frontendEdit->displayEditIcons($content, $params, $conf, $currentRecord, $dataArr, $addURLParamStr); + } else { + $content = $GLOBALS['BE_USER']->frontendEdit->displayEditIcons($content, $params, array(), $currentRecord, $dataArr, $addURLParamStr); + } } return $content;