diff -ru TYPO3_4-4/typo3/sysext/cms/tslib/class.tslib_content.php TYPO3_4-4-patched/typo3/sysext/cms/tslib/class.tslib_content.php
--- TYPO3_4-4/typo3/sysext/cms/tslib/class.tslib_content.php	2010-11-08 20:40:02.000000000 +0100
+++ TYPO3_4-4-patched/typo3/sysext/cms/tslib/class.tslib_content.php	2010-11-08 22:22:33.000000000 +0100
@@ -8151,7 +8151,8 @@
 				$dataArr = $this->data;
 			}
 
-				// Delegate rendering of the edit panel to the t3lib_frontendedit class.
+			// Delegate rendering of the edit panel to the t3lib_frontendedit class.
+			if(!is_array()) $conf = array();	//make sure $conf is an array, don't accept null
 			$content = $GLOBALS['BE_USER']->frontendEdit->displayEditIcons($content, $params, $conf, $currentRecord, $dataArr, $addURLParamStr);
 		}