File typo3-4.7.7-fixes.patch of Package typo3-cms-4_7

Overview Repositories Revisions Requests Users Attributes Meta

File typo3-4.7.7-fixes.patch of Package typo3-cms-4_7

diff -rupN typo3-4.7.7.orig/t3lib/class.t3lib_ajax.php typo3-4.7.7/t3lib/class.t3lib_ajax.php
--- typo3-4.7.7.orig/t3lib/class.t3lib_ajax.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/t3lib/class.t3lib_ajax.php	2012-11-13 11:47:19.000000000 +0100
@@ -114,7 +114,7 @@ class t3lib_ajax {
 	 * @param	string		$innerXML	XML data which will be sent to the browser
 	 * @return	void
 	 */
-	function outputXMLreply($innerXML) {
+	static function outputXMLreply($innerXML) {
 			// AJAX needs some XML data
 		header('Content-Type: text/xml');
 		$xml = '<?xml version="1.0"?>
@@ -128,4 +128,4 @@ class t3lib_ajax {
 if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_ajax.php'])) {
 	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_ajax.php']);
 }
-?>
\ No newline at end of file
+?>
diff -rupN typo3-4.7.7.orig/t3lib/class.t3lib_recordlist.php typo3-4.7.7/t3lib/class.t3lib_recordlist.php
--- typo3-4.7.7.orig/t3lib/class.t3lib_recordlist.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/t3lib/class.t3lib_recordlist.php	2012-11-13 11:50:32.000000000 +0100
@@ -141,6 +141,7 @@ class t3lib_recordList {
 						$cssClass = implode(' ', array($this->addElement_tdCssClass[$lastKey], $this->oddColumnsCssClass));
 					}
 
+					if(!isset($data[$lastKey])) $data[$lastKey] = '';
 					$out .= '
 						<td' .
 							$noWrap .
@@ -373,4 +374,4 @@ if (defined('TYPO3_MODE') && isset($GLOB
 	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_recordlist.php']);
 }
 
-?>
\ No newline at end of file
+?>
diff -rupN typo3-4.7.7.orig/t3lib/class.t3lib_tceforms_inline.php typo3-4.7.7/t3lib/class.t3lib_tceforms_inline.php
--- typo3-4.7.7.orig/t3lib/class.t3lib_tceforms_inline.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/t3lib/class.t3lib_tceforms_inline.php	2012-11-13 11:33:45.000000000 +0100
@@ -2393,7 +2393,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']);
 
diff -rupN typo3-4.7.7.orig/t3lib/class.t3lib_userauthgroup.php typo3-4.7.7/t3lib/class.t3lib_userauthgroup.php
--- typo3-4.7.7.orig/t3lib/class.t3lib_userauthgroup.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/t3lib/class.t3lib_userauthgroup.php	2012-11-13 11:52:51.000000000 +0100
@@ -1700,8 +1700,10 @@ abstract class t3lib_userAuthGroup exten
 	 */
 	function writelog($type, $action, $error, $details_nr, $details, $data, $tablename = '', $recuid = '', $recpid = '', $event_pid = -1, $NEWid = '', $userId = 0) {
 
+		$thisuseruid = (isset($this->user['uid'])) ? $this->user['uid'] : 0;
+
 		$fields_values = array(
-			'userid' => $userId ? $userId : intval($this->user['uid']),
+			'userid' => $userId ? $userId : intval($thisuseruid),
 			'type' => intval($type),
 			'action' => intval($action),
 			'error' => intval($error),
diff -rupN typo3-4.7.7.orig/typo3/class.browse_links.php typo3-4.7.7/typo3/class.browse_links.php
--- typo3-4.7.7.orig/typo3/class.browse_links.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/typo3/class.browse_links.php	2012-11-13 11:44:18.000000000 +0100
@@ -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>';
@@ -363,10 +363,10 @@ class TBE_PageTree extends localPageTree
 	 *
 	 * @param	string		Title, ready for output.
 	 * @param	array		The record
-	 * @param	boolean		If set, pages clicked will return immediately, otherwise reload page.
+	 * @param	integer		If set, pages clicked will return immediately, otherwise reload page.
 	 * @return	string		Wrapping title string.
 	 */
-	function wrapTitle($title,$v,$ext_pArrPages)	{
+	function wrapTitle($title,$v,$ext_pArrPages=0)	{
 		if ($ext_pArrPages)	{
 			$ficon=t3lib_iconWorks::getIcon('pages',$v);
 			$onClick = "return insertElement('pages', '".$v['uid']."', 'db', ".t3lib_div::quoteJSvalue($v['title']).", '', '', '".$ficon."','',1);";
@@ -424,9 +424,10 @@ class localFolderTree extends t3lib_fold
 	 *
 	 * @param	string		Title, ready for output.
 	 * @param	array		The "record"
+	 * @param	integer		[See parent]
 	 * @return	string		Wrapping title string.
 	 */
-	function wrapTitle($title,$v)	{
+	function wrapTitle($title,$v,$bank=0)	{
 		if ($this->ext_isLinkable($v))	{
 			$aOnClick = 'return jumpToUrl(\''.$this->thisScript.'?act='.$GLOBALS['SOBE']->browser->act.'&mode='.$GLOBALS['SOBE']->browser->mode.'&expandFolder='.rawurlencode($v['path']).'\');';
 			return '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$title.'</a>';
@@ -575,9 +576,10 @@ class TBE_FolderTree extends localFolder
 	 *
 	 * @param	string		Title, ready for output.
 	 * @param	array		The 'record'
+	 * @param	integer		[See parent]
 	 * @return	string		Wrapping title string.
 	 */
-	function wrapTitle($title,$v)	{
+	function wrapTitle($title,$v,$bank=0)	{
 		if ($this->ext_isLinkable($v))	{
 			$aOnClick = 'return jumpToUrl(\''.$this->thisScript.'?act='.$GLOBALS['SOBE']->browser->act.'&mode='.$GLOBALS['SOBE']->browser->mode.'&expandFolder='.rawurlencode($v['path']).'\');';
 			return '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$title.'</a>';
diff -rupN typo3-4.7.7.orig/typo3/class.file_list.inc typo3-4.7.7/typo3/class.file_list.inc
--- typo3-4.7.7.orig/typo3/class.file_list.inc	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/typo3/class.file_list.inc	2012-11-13 11:48:11.000000000 +0100
@@ -390,9 +390,10 @@ class fileList extends t3lib_recordList
 	/**
 	 * Returns list URL; This is the URL of the current script with id and imagemode parameters, thats all.
 	 *
+	 * @param	string		[See parent]
 	 * @return	string		URL
 	 */
-	function listURL()	{
+	function listURL($altId = '')	{
 		return $this->script.'?id='.rawurlencode($this->path).'&imagemode='.$this->thumbs;
 	}
 
@@ -736,4 +737,4 @@ class fileList extends t3lib_recordList
 if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.file_list.inc'])) {
 	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.file_list.inc']);
 }
-?>
\ No newline at end of file
+?>
diff -rupN typo3-4.7.7.orig/typo3/class.filelistfoldertree.php typo3-4.7.7/typo3/class.filelistfoldertree.php
--- typo3-4.7.7.orig/typo3/class.filelistfoldertree.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/typo3/class.filelistfoldertree.php	2012-11-13 11:49:46.000000000 +0100
@@ -91,7 +91,7 @@ class filelistFolderTree extends t3lib_f
 	 * @param	array		Data row for element.
 	 * @return	string		Page icon
 	 */
-	function wrapIcon($theFolderIcon, &$row)	{
+	function wrapIcon($theFolderIcon, $row)	{
 
 			// Wrap icon in click-menu link.
 		if (!$this->ext_IconMode)	{
@@ -364,10 +364,11 @@ class filelistFolderTree extends t3lib_f
 	 *
 	 * @param	string		Abs file path
 	 * @param	integer		Max depth (recursivity limit)
+	 * @param	string		[See parent]
 	 * @return	integer		The count of items on the level
 	 * @see getBrowsableTree()
 	 */
-	function getFolderTree($files_path, $depth=999, $type='')	{
+	function getFolderTree($files_path, $depth=999, $depthData = '', $type='')	{
 
 			// This generates the directory tree
 		$dirs = t3lib_div::get_dirs($files_path);
@@ -466,4 +467,4 @@ if (defined('TYPO3_MODE') && isset($GLOB
 	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.filelistfoldertree.php']);
 }
 
-?>
\ No newline at end of file
+?>
diff -rupN typo3-4.7.7.orig/typo3/sysext/beuser/class.tx_beuser_switchbackuser.php typo3-4.7.7/typo3/sysext/beuser/class.tx_beuser_switchbackuser.php
--- typo3-4.7.7.orig/typo3/sysext/beuser/class.tx_beuser_switchbackuser.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/typo3/sysext/beuser/class.tx_beuser_switchbackuser.php	2012-11-13 11:45:31.000000000 +0100
@@ -31,8 +31,8 @@ class tx_beuser_switchbackuser {
 		if (
 			$that->session_table == 'be_sessions'
 			&& is_array($that->user)
-			&& $that->user['uid']
-			&& $that->user['ses_backuserid']
+			&& isset($that->user['uid'])
+			&& isset($that->user['ses_backuserid'])
 		) {
 			$updateData = array(
 				'ses_userid' => $that->user['ses_backuserid'],
@@ -46,4 +46,4 @@ class tx_beuser_switchbackuser {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff -rupN typo3-4.7.7.orig/typo3/sysext/beuser/mod/index.php typo3-4.7.7/typo3/sysext/beuser/mod/index.php
--- typo3-4.7.7.orig/typo3/sysext/beuser/mod/index.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/typo3/sysext/beuser/mod/index.php	2012-11-13 11:36:58.000000000 +0100
@@ -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	integer		[See parent]
 	 * @return	string
 	 */
-	function wrapTitle($str,$row)	{
+	function wrapTitle($str,$row,$bank=0)	{
 		return $str;
 	}
 
diff -rupN typo3-4.7.7.orig/typo3/sysext/cms/tslib/class.tslib_content.php typo3-4.7.7/typo3/sysext/cms/tslib/class.tslib_content.php
--- typo3-4.7.7.orig/typo3/sysext/cms/tslib/class.tslib_content.php	2012-11-13 09:51:01.000000000 +0100
+++ typo3-4.7.7/typo3/sysext/cms/tslib/class.tslib_content.php	2012-11-13 11:34:39.000000000 +0100
@@ -4257,7 +4257,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) {
@@ -5570,7 +5570,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) {
@@ -8097,4 +8097,4 @@ if (defined('TYPO3_MODE') && isset($GLOB
 	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['tslib/class.tslib_content.php']);
 }
 
-?>
\ No newline at end of file
+?>

Places

File typo3-4.7.7-fixes.patch of Package typo3-cms-4_7

Places