--- typo3/sysext/extbase/Classes/Utility/Extension.php.orig	2012-05-03 11:20:13.000000000 +0200
+++ typo3/sysext/extbase/Classes/Utility/Extension.php	2012-05-03 11:22:57.000000000 +0200
@@ -174,7 +174,7 @@ tt_content.' . $pluginSignature . ' {
 	 * @param string $modulePath Absolute path to module (not used by Extbase currently)
 	 * @return array Configuration of the module
 	 */
-	public function configureModule($moduleSignature, $modulePath) {
+	static public function configureModule($moduleSignature, $modulePath) {
 		$moduleConfiguration = $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature];
 		$iconPathAndFilename = $moduleConfiguration['icon'];
 		if (substr($iconPathAndFilename, 0, 4) === 'EXT:') {
@@ -555,4 +555,4 @@ tt_content.' . $pluginSignature . ' {
 	}
 }
 
-?>
\ Kein Zeilenumbruch am Dateiende.
+?>
--- typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php.orig	2012-05-03 14:03:38.000000000 +0200
+++ typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php	2012-05-03 14:03:56.000000000 +0200
@@ -230,7 +230,7 @@ class tx_rtehtmlarea_base extends t3lib_
 	 * @return	string		HTML code for RTE!
 	 */
 
-	function drawRTE($parentObject, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) {
+	function drawRTE(&$parentObject, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) {
 		global $LANG, $TYPO3_DB, $TYPO3_CONF_VARS;
 
 		$this->TCEform = $parentObject;
@@ -1456,4 +1456,4 @@ class tx_rtehtmlarea_base extends t3lib_
 if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/class.tx_rtehtmlarea_base.php'])) {
 	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/class.tx_rtehtmlarea_base.php']);
 }
-?>
\ Kein Zeilenumbruch am Dateiende.
+?>
--- t3lib/class.t3lib_tceforms_inline.php.orig	2012-05-03 14:12:11.000000000 +0200
+++ t3lib/class.t3lib_tceforms_inline.php	2012-05-03 14:12:46.000000000 +0200
@@ -2388,7 +2388,7 @@ class t3lib_TCEforms_inline {
 	 * @param	t3lib_TCEmain	$tce: Instance of TCEmain that saved data before
 	 * @return	void
 	 */
-	function updateInlineView(&$uc, $tce) {
+	static function updateInlineView(&$uc, $tce) {
 		if (isset($uc['inlineView']) && is_array($uc['inlineView'])) {
 			$inlineView = (array) unserialize($GLOBALS['BE_USER']->uc['inlineView']);
 
--- typo3/sysext/cms/tslib/class.tslib_content.php.orig	2012-05-03 14:31:13.000000000 +0200
+++ typo3/sysext/cms/tslib/class.tslib_content.php	2012-05-03 14:32:07.000000000 +0200
@@ -4224,7 +4224,7 @@ class tslib_cObj {
 	 * @return	integer		The result (might be a float if you did a division of the numbers).
 	 * @see t3lib_utility_Math::calculateWithPriorityToAdditionAndSubtraction()
 	 */
-	function calc($val) {
+	static function calc($val) {
 		$parts = t3lib_div::splitCalc($val, '+-*/');
 		$value = 0;
 		foreach ($parts as $part) {
@@ -5537,7 +5537,7 @@ class tslib_cObj {
 	 * @access private
 	 * @see getData()
 	 */
-	function getKey($key, $arr) {
+	static function getKey($key, $arr) {
 		$key = intval($key);
 		if (is_array($arr)) {
 			if ($key < 0) {
--- typo3/class.browse_links.php.orig	2012-05-03 15:55:49.000000000 +0200
+++ typo3/class.browse_links.php	2012-05-03 15:54:37.000000000 +0200
@@ -206,10 +206,10 @@ class localPageTree extends t3lib_browse
 	 *
 	 * @param	string		Title, (must be ready for output, that means it must be htmlspecialchars()'ed).
 	 * @param	array		The record
-	 * @param	boolean		(Ignore)
+	 * @param	integer		(Ignore)
 	 * @return	string		Wrapping title string.
 	 */
-	function wrapTitle($title,$v,$ext_pArrPages='')	{
+	function wrapTitle($title,$v,$ext_pArrPages=0)	{
 		if ($this->ext_isLinkable($v['doktype'],$v['uid']))	{
 			$aOnClick = "return link_typo3Page('".$v['uid']."');";
 			return '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$title.'</a>';
--- typo3/sysext/beuser/mod/index.php.orig	2012-05-03 15:57:57.000000000 +0200
+++ typo3/sysext/beuser/mod/index.php	2012-05-03 15:59:53.000000000 +0200
@@ -102,9 +102,10 @@ $BE_USER->modAccess($MCONF,1);
 	 *
 	 * @param	string		[See parent]
 	 * @param	array		[See parent]
+	 * @param 	integer 	[See parent]
 	 * @return	string
 	 */
-	function wrapTitle($str,$row)	{
+	function wrapTitle($str,$row,$bank=0)	{
 		return $str;
 	}
 
@@ -363,9 +364,10 @@ class printAllPageTree_perms extends pri
 	 *
 	 * @param	string		[See parent]
 	 * @param	array		[See parent]
+	 * @param 	interger 	[See parent]
 	 * @return	string
 	 */
-	function wrapTitle($str,$row)	{
+	function wrapTitle($str,$row,$bank=0)	{
 		return $str;
 	}
 
--- typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php.orig	2012-05-03 16:37:26.000000000 +0200
+++ typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php	2012-05-03 16:40:13.000000000 +0200
@@ -58,10 +58,10 @@ class Tx_Fluid_Core_Widget_WidgetRequest
 	/**
 	 * Injects the request handler
 	 *
-	 * @param Tx_Fluid_Core_Widget_WidgetRequestBuilder $requestBuilder
+	 * @param Tx_Extbase_MVC_Web_RequestBuilder $requestBuilder
 	 * @return void
 	 */
-	public function injectRequestBuilder(Tx_Fluid_Core_Widget_WidgetRequestBuilder $requestBuilder) {
+	public function injectRequestBuilder(Tx_Extbase_MVC_Web_RequestBuilder $requestBuilder) {
 		$this->requestBuilder = $requestBuilder;
 	}
 
@@ -99,4 +99,4 @@ class Tx_Fluid_Core_Widget_WidgetRequest
 	}
 }
 
-?>
\ Kein Zeilenumbruch am Dateiende.
+?>
--- typo3/sysext/extbase/Classes/Utility/Localization.php.orig	2012-05-04 06:15:54.000000000 +0200
+++ typo3/sysext/extbase/Classes/Utility/Localization.php	2012-05-04 06:16:38.000000000 +0200
@@ -133,7 +133,7 @@ class Tx_Extbase_Utility_Localization {
 	 * @see tslib_fe::sL()
 	 * @author Bastian Waidelich <bastian@typo3.org>
 	 */
-	protected function translateFileReference($key) {
+	static protected function translateFileReference($key) {
 		if (TYPO3_MODE === 'FE') {
 			$value = $GLOBALS['TSFE']->sL($key);
 			return $value !== FALSE ? $value : NULL;
@@ -277,4 +277,4 @@ class Tx_Extbase_Utility_Localization {
 		}
 	}
 }
-?>
\ Kein Zeilenumbruch am Dateiende.
+?>