Bug #36828 » typo3-4.7.0-fixes.patch
typo3/sysext/extbase/Classes/Utility/Extension.php 2012-05-03 11:22:57.000000000 +0200 | ||
---|---|---|
* @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:') {
|
||
... | ... | |
}
|
||
}
|
||
?>
|
||
?>
|
||
-- 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
|
||
... | ... | |
* @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;
|
||
... | ... | |
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']);
|
||
}
|
||
?>
|
||
?>
|
||
-- 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
|
||
... | ... | |
* @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
|
||
... | ... | |
* @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) {
|
||
... | ... | |
* @access private
|
||
* @see getData()
|
||
*/
|
||
function getKey($key, $arr) {
|
||
static function getKey($key, $arr) {
|
||
$key = intval($key);
|
||
if (is_array($arr)) {
|
||
if ($key < 0) {
|
||
-- 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
|
||
... | ... | |
*
|
||
* @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;
|
||
}
|
||
... | ... | |
*
|
||
* @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
|
||
... | ... | |
/**
|
||
* 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;
|
||
}
|
||
... | ... | |
}
|
||
}
|
||
?>
|
||
?>
|
||
-- 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
|
||
... | ... | |
* @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;
|
||
... | ... | |
}
|
||
}
|
||
}
|
||
?>
|
||
?>
|
||
-- t3lib/class.t3lib_befunc.php.orig 2012-05-04 08:10:16.000000000 +0200
|
||
++ t3lib/class.t3lib_befunc.php 2012-05-04 08:44:55.000000000 +0200
|
||
... | ... | |
* @see t3lib_transferData::lockRecord(), alt_doc.php, db_layout.php, db_list.php, wizard_rte.php
|
||
*/
|
||
public static function lockRecords($table = '', $uid = 0, $pid = 0) {
|
||
$user_id = intval($GLOBALS['BE_USER']->user['uid']);
|
||
$user_id = intval(isset($GLOBALS['BE_USER']->user['uid']) ? $GLOBALS['BE_USER']->user['uid'] : 0);
|
||
if ($table && $uid) {
|
||
$fields_values = array(
|
||
'userid' => $user_id,
|
||
-- typo3/class.browse_links.php.orig 2012-05-04 08:47:50.000000000 +0200
|
||
++ typo3/class.browse_links.php 2012-05-04 08:52:12.000000000 +0200
|
||
... | ... | |
*
|
||
* @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);";
|
||
... | ... | |
*
|
||
* @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>';
|
||
... | ... | |
*
|
||
* @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>';
|
||
-- typo3/sysext/beuser/class.tx_beuser_switchbackuser.php.orig 2012-05-04 08:56:06.000000000 +0200
|
||
++ typo3/sysext/beuser/class.tx_beuser_switchbackuser.php 2012-05-04 08:57:47.000000000 +0200
|
||
... | ... | |
*/
|
||
class tx_beuser_switchbackuser {
|
||
function switchBack($params, $that) {
|
||
if($that->session_table == 'be_sessions' && $that->user['uid'] && $that->user['ses_backuserid']) {
|
||
if($that->session_table == 'be_sessions' && isset($that->user['uid']) && isset($that->user['ses_backuserid'])) {
|
||
$updateData = array(
|
||
'ses_userid' => $that->user['ses_backuserid'],
|
||
'ses_backuserid' => 0
|
||
... | ... | |
}
|
||
}
|
||
?>
|
||
?>
|
||
-- typo3/template.php.orig 2012-05-04 09:00:11.000000000 +0200
|
||
++ typo3/template.php 2012-05-04 09:01:42.000000000 +0200
|
||
... | ... | |
*/
|
||
protected function getPagePath($pageRecord) {
|
||
// Is this a real page
|
||
if ($pageRecord['uid']) {
|
||
if (isset($pageRecord['uid']) && $pageRecord['uid']) {
|
||
$title = substr($pageRecord['_thePathFull'], 0, -1);
|
||
// remove current page title
|
||
$pos = strrpos($title, '/');
|
||
... | ... | |
protected function getPageInfo($pageRecord) {
|
||
// Add icon with clickmenu, etc:
|
||
if ($pageRecord['uid']) { // If there IS a real page
|
||
if (isset($pageRecord['uid']) && $pageRecord['uid']) { // If there IS a real page
|
||
$alttext = t3lib_BEfunc::getRecordIconAltText($pageRecord, 'pages');
|
||
$iconImg = t3lib_iconWorks::getSpriteIconForRecord('pages', $pageRecord, array('title'=>$alttext));
|
||
// Make Icon:
|
||
-- t3lib/class.t3lib_ajax.php.orig 2012-05-04 09:03:05.000000000 +0200
|
||
++ t3lib/class.t3lib_ajax.php 2012-05-04 09:03:38.000000000 +0200
|
||
... | ... | |
* @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"?>
|
||
... | ... | |
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']);
|
||
}
|
||
?>
|
||
?>
|
||
-- typo3/class.file_list.inc.orig 2012-05-04 09:06:11.000000000 +0200
|
||
++ typo3/class.file_list.inc 2012-05-04 09:07:11.000000000 +0200
|
||
... | ... | |
/**
|
||
* 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;
|
||
}
|
||
... | ... | |
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']);
|
||
}
|
||
?>
|
||
?>
|
||
-- typo3/class.filelistfoldertree.php.orig 2012-05-04 09:08:01.000000000 +0200
|
||
++ typo3/class.filelistfoldertree.php 2012-05-04 09:12:58.000000000 +0200
|
||
... | ... | |
* @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) {
|
||
... | ... | |
*
|
||
* @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);
|
||
... | ... | |
include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.filelistfoldertree.php']);
|
||
}
|
||
?>
|
||
?>
|
||
-- t3lib/class.t3lib_recordlist.php.orig 2012-05-04 10:58:06.000000000 +0200
|
||
++ t3lib/class.t3lib_recordlist.php 2012-05-04 11:00:43.000000000 +0200
|
||
... | ... | |
$cssClass = implode(' ', array($this->addElement_tdCssClass[$lastKey], $this->oddColumnsCssClass));
|
||
}
|
||
if(!isset($data[$lastKey])) $data[$lastKey] = '';
|
||
$out .= '
|
||
<td' . $noWrap . ' class="' . $cssClass . '"' . $colsp . $this->addElement_tdParams[$lastKey] . '>' . $data[$lastKey] . '</td>';
|
||
}
|
||
... | ... | |
include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_recordlist.php']);
|
||
}
|
||
?>
|
||
?>
|
||
-- t3lib/class.t3lib_userauthgroup.php.orig 2012-05-04 11:23:21.000000000 +0200
|
||
++ t3lib/class.t3lib_userauthgroup.php 2012-05-04 12:10:12.000000000 +0200
|
||
... | ... | |
*/
|
||
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']),
|
||
'type' => intval($type),
|
||
-- t3lib/class.t3lib_userauthgroup.php.orig 2012-05-04 11:23:21.000000000 +0200
|
||
++ t3lib/class.t3lib_userauthgroup.php 2012-05-04 14:26:50.000000000 +0200
|
||
... | ... | |
*/
|
||
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),
|
- « Previous
- 1
- 2
- Next »