Re: please unblock typo3-src for wheezy
On 28.07.2012 18:25, Julien Cristau wrote:
> I can see that they're changes from upstream. I can't see what the
> changes actually are because the diff is basically "remove the entire
> file and add it back".
Ah, ok.
It seems someone changed all line endings from unix to windows.
I attached the diff from 4.5.16 to 4.5.17 orig tar gz without
files were only whitespaces are changed (diff -Naurw).
--
MfG, Christian Welzel
GPG-Key: pub 4096R/5117E119 2011-09-19
Fingerprint: 3688 337C 0D3E 3725 94EC E401 8D52 CDE9 5117 E119
diff -Naurw blankpackage-4.5.16/ChangeLog blankpackage-4.5.17/ChangeLog
--- blankpackage-4.5.16/ChangeLog 2012-05-22 12:03:06.000000000 +0200
+++ blankpackage-4.5.17/ChangeLog 2012-07-04 11:19:24.000000000 +0200
@@ -1,3 +1,31 @@
+2012-07-04 acf7796 [RELEASE] Release of TYPO3 4.5.17 (TYPO3 Release Team)
+2012-07-04 4356de4 #38578 [SECURITY] XSS in swfupload (Oliver Hader)
+2012-07-04 d5cb5fb #35154 [BUGFIX] Exclude E_STRICT from exceptionalErrors (Mario Rimann)
+2012-07-04 4cca68b #37615 [BUGFIX] IRRE records can't be expanded without an hidden field (Oliver Hader)
+2012-07-04 5fd49b5 #29254 [BUGFIX] TSFE->additionalFooterData for USER_INT (Oliver Hader)
+2012-07-03 15847d2 #38574 [BUGFIX] In IE9, RTE does not work correctly in compat modes IE8/IE7 (Stanislas Rolland)
+2012-07-03 9a1c36c #34786 [BUGFIX] Custom HTML tags no longer malformed in IE (Bart Dubelaar)
+2012-07-01 8ea1408 #38511 [BUGFIX] Remove a rather dubious unit test for Redis cache backend (Christian Kuhn)
+2012-06-30 353ab74 #38501 [BUGFIX] Fix unit test failure if gif compress is disabled (Susanne Moog)
+2012-06-30 74701ef #35915 [BUGFIX] VariableFrontend initializeObject not called (Daniel Pötzinger)
+2012-06-30 2cc2efb #37618 [BUGFIX] Remove class of td if "No CSS styles for this table" is set (Juergen Furrer)
+2012-06-30 364926e #36290 [BUGFIX] Markers (%s) are not replaced in TCEmain error messages (Bart Dubelaar)
+2012-06-29 880f256 #38357 [TASK] Add travis configuration file (Helmut Hummel)
+2012-06-29 027a9b3 #36093 [BUGFIX] Reports: Wrong indication for saltedpasswords (Markus Klein)
+2012-06-28 885d256 #37541 [BUGFIX] Declaration of tx_rtehtmlarea_base::drawRTE() not compatible (Stanislas Rolland)
+2012-06-28 50b5136 #34303 [BUGFIX] IRRE hide/unhide broken (dkd-egerer Sascha Egerer)
+2012-06-28 6918eda #34685 [TASK] PHP 5.4 adjustments (Markus Klein)
+2012-06-28 1f7ebfd #36194 [BUGFIX] Ensure $output is used as string (Peter Niederlag)
+2012-06-27 7366511 #32773 [BUGFIX] fe_adminLib.inc uses undefined function (Sven Burkert)
+2012-06-27 b82dfa5 [TASK] Raise submodule pointer (TYPO3 Release Team)
+2012-06-21 3f3c200 #36300 [BUGFIX] Properly load existing usergroups in task (Bart Dubelaar)
+2012-06-13 1e97470 #35944 [BUGFIX] Hide the field "Selected Pages" for menu type "Sitemap" (Marco Huber)
+2012-05-30 bbc55bf #21943 [BUGFIX] redirect to referrer when changing password (Jigal van Hemert)
+2012-05-28 1c43954 #37553 BUGFIX] Illegal string offset (Jigal van Hemert)
+2012-05-22 1d59cbf [TASK] Set TYPO3 version to 4.5.17-dev (TYPO3 v4 Release Team)
+2012-05-22 75b2564 [RELEASE] Release of TYPO3 4.5.16 (TYPO3 v4 Release Team)
+
+
2012-05-22 841e939 [RELEASE] Release of TYPO3 4.5.16 (TYPO3 v4 Release Team)
2012-05-22 b81c747 [TASK] Raise submodule pointer (TYPO3 v4 Release Team)
2012-05-21 d4da799 #26993 [BUGFIX] Pagetree: Copying large branches duplicates branch (Steffen Gebert)
diff -Naurw blankpackage-4.5.16/index.php blankpackage-4.5.17/index.php
--- blankpackage-4.5.16/index.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/index.php 2012-07-04 11:19:29.000000000 +0200
@@ -39,12 +39,7 @@
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
-
+error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
// ******************
// Constants defined
diff -Naurw blankpackage-4.5.16/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php blankpackage-4.5.17/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php
--- blankpackage-4.5.16/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php 2012-07-04 11:19:29.000000000 +0200
@@ -62,7 +62,7 @@
* @return void
* @author Robert Lemke <robert@typo3.org>
*/
- protected function initializeObject() {
+ public function initializeObject() {
$this->useIgBinary = extension_loaded('igbinary');
}
diff -Naurw blankpackage-4.5.16/t3lib/class.t3lib_befunc.php blankpackage-4.5.17/t3lib/class.t3lib_befunc.php
--- blankpackage-4.5.16/t3lib/class.t3lib_befunc.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/t3lib/class.t3lib_befunc.php 2012-07-04 11:19:29.000000000 +0200
@@ -2739,22 +2739,19 @@
$helpTextArray = self::helpTextArray($table, $field);
$output = '';
+ $arrow = '';
- // put header before the rest of the text
+ // Put header before the rest of the text
if ($helpTextArray['title'] !== NULL) {
$output .= '<h2 class="t3-row-header">' . $helpTextArray['title'] . '</h2>';
}
- // add the content
- if ($helpTextArray['description'] !== NULL) {
- $output .= $helpTextArray['description'];
- }
- // add see also arrow if we have more info
+ // Add see also arrow if we have more info
if ($helpTextArray['moreInfo']) {
$arrow = t3lib_iconWorks::getSpriteIcon('actions-view-go-forward');
}
- // add description text
- if ($helpTextArray['description'] || $arrow) {
- $output['description'] = '<p class="t3-help-short">' . nl2br(htmlspecialchars($helpTextArray['description'])) . $arrow . '</p>';
+ // Wrap description and arrow in p tag
+ if ($helpTextArray['description'] !== NULL || $arrow) {
+ $output .= '<p class="t3-help-short">' . nl2br(htmlspecialchars($helpTextArray['description'])) . $arrow . '</p>';
}
return $output;
diff -Naurw blankpackage-4.5.16/t3lib/class.t3lib_tceforms_inline.php blankpackage-4.5.17/t3lib/class.t3lib_tceforms_inline.php
--- blankpackage-4.5.16/t3lib/class.t3lib_tceforms_inline.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/t3lib/class.t3lib_tceforms_inline.php 2012-07-04 11:19:29.000000000 +0200
@@ -434,6 +434,11 @@
} else {
// set additional field for processing for saving
$fields .= '<input type="hidden" name="' . $this->prependCmdFieldNames . $appendFormFieldNames . '[delete]" value="1" disabled="disabled" />';
+ if (!$isExpanded && !empty($GLOBALS['TCA'][$foreign_table]['ctrl']['enablecolumns']['disabled'])) {
+ $checked = (!empty($rec['hidden']) ? ' checked="checked"' : '');
+ $fields .= '<input type="checkbox" name="' . $this->prependFormFieldNames . $appendFormFieldNames . '[hidden]_0" value="1"' . $checked . ' />';
+ $fields .= '<input type="input" name="' . $this->prependFormFieldNames . $appendFormFieldNames . '[hidden]" value="' . $rec['hidden'] . '" />';
+ }
}
// if this record should be shown collapsed
if (!$isExpanded) {
diff -Naurw blankpackage-4.5.16/t3lib/class.t3lib_tcemain.php blankpackage-4.5.17/t3lib/class.t3lib_tcemain.php
--- blankpackage-4.5.16/t3lib/class.t3lib_tcemain.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/t3lib/class.t3lib_tcemain.php 2012-07-04 11:19:29.000000000 +0200
@@ -7083,7 +7083,11 @@
$details = '';
}
if ($error > 0) {
- $this->errorLog[] = '[' . $type . '.' . $action . '.' . $details_nr . ']: ' . $details;
+ $detailMessage = $details;
+ if (is_array($data)) {
+ $detailMessage = vsprintf($details, $data);
+ }
+ $this->errorLog[] = '[' . $type . '.' . $action . '.' . $details_nr . ']: ' . $detailMessage;
}
return $this->BE_USER->writelog($type, $action, $error, $details_nr, $details, $data, $table, $recuid, $recpid, $event_pid, $NEWid);
}
diff -Naurw blankpackage-4.5.16/t3lib/config_default.php blankpackage-4.5.17/t3lib/config_default.php
--- blankpackage-4.5.16/t3lib/config_default.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/t3lib/config_default.php 2012-07-04 11:19:29.000000000 +0200
@@ -157,12 +157,12 @@
'productionExceptionHandler' => 't3lib_error_ProductionExceptionHandler', // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "t3lib_error_ProductionExceptionHandler". This exception handler displays a nice error message when something went wrong. The error message is logged to the configured logs. Note: The configured "productionExceptionHandler" is used if displayErrors is set to "0" or to "-1" and devIPmask doesn't match the users IP.
'debugExceptionHandler' => 't3lib_error_DebugExceptionHandler', // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "t3lib_error_DebugExceptionHandler". This exception handler displays the complete stack trace of any encountered exception. The error message and the stack trace is logged to the configured logs. Note: The configured "debugExceptionHandler" is used if displayErrors is set to "1" and if displayErrors is "-1" or "2" and the devIPmask matches the users IP.
'errorHandler' => 't3lib_error_ErrorHandler', // String: Classname to handle PHP errors. E.g.: t3lib_error_ErrorHandler. This class displays and logs all errors that are registered as "errorHandlerErrors" (<a href="#SYS-errorHandlerErrors">[SYS][errorHandlerErrors]</a>). Leave empty to disable error handling. Errors can be logged to syslog (see: <a href="#SYS-systemLog">[SYS][systemLog]</a>) to the installed developer log and to the "syslog" table. If an error is registered in "exceptionalErrors" ([SYS][exceptionalErrors]) it will be turned into an exception to be handled by the configured exceptionHandler.
- 'errorHandlerErrors'=> E_ALL ^ E_NOTICE, // Integer: The E_* constant that will be handled by the errorhandler. Default is "E_ALL ^ E_NOTICE".
- 'exceptionalErrors' => E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_USER_ERROR ^ E_USER_NOTICE ^ E_USER_WARNING, // Integer: The E_* constant that will be handled as an exception by t3lib_error_ErrorHandler. Default is <tt>E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_USER_ERROR ^ E_USER_NOTICE ^ E_USER_WARNING</tt> (20725) and "0" if <tt>displayErrors=0</tt> (see <a href="http://php.net/manual/en/errorfunc.constants.php"; target="_blank">PHP documentation</a>).
+ 'errorHandlerErrors' => E_ALL & ~(E_STRICT | E_NOTICE), // Integer: The E_* constant that will be handled by the errorhandler. Default is "E_ALL ^ E_NOTICE".
+ 'exceptionalErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING), // Integer: The E_* constant that will be handled as an exception by t3lib_error_ErrorHandler. Default is <tt>E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_USER_ERROR ^ E_USER_NOTICE ^ E_USER_WARNING</tt> (20725) and "0" if <tt>displayErrors=0</tt> (see <a href="http://php.net/manual/en/errorfunc.constants.php"; target="_blank">PHP documentation</a>).
'enable_errorDLOG' => 0, // Boolean: If set, errors are written to the developer log (requires an installed *devlog* extension).
'enable_exceptionDLOG' => 0, // Boolean: If set, exceptions are written to the developer log (requires an installed *devlog* extension).
- 'syslogErrorReporting' => E_ALL ^ E_NOTICE, // Integer: Configures which PHP errors should be logged to the configured syslogs (see: [SYS][systemLog]). If set to "0" no PHP errors are logged to the syslog. Default is "E_ALL ^ E_NOTICE" (6135).
- 'belogErrorReporting' => E_ALL ^ E_NOTICE, // Integer: Configures which PHP errors should be logged to the "syslog" table (extension: belog). If set to "0" no PHP errors are logged to the sys_log table. Default is "E_ALL ^ E_NOTICE" (6135).
+ 'syslogErrorReporting' => E_ALL & ~(E_STRICT | E_NOTICE), // Integer: Configures which PHP errors should be logged to the configured syslogs (see: [SYS][systemLog]). If set to "0" no PHP errors are logged to the syslog. Default is "E_ALL ^ E_NOTICE" (6135).
+ 'belogErrorReporting' => E_ALL & ~(E_STRICT | E_NOTICE), // Integer: Configures which PHP errors should be logged to the "syslog" table (extension: belog). If set to "0" no PHP errors are logged to the sys_log table. Default is "E_ALL ^ E_NOTICE" (6135).
'locallangXMLOverride' => array(), // For extension/overriding of the arrays in 'locallang' files in frontend and backend. See 'Inside TYPO3' for more information.
'generateApacheHtaccess' => 1, // Boolean: TYPO3 can create <em>.htaccess</em> files which are used by Apache Webserver. They are useful for access protection or performance improvements. Currently <em>.htaccess</em> files in the following directories are created, if they do not exist: <ul><li>typo3temp/compressor/</li></ul>You want to disable this feature, if you are not running Apache or want to use own rulesets.
),
@@ -672,7 +672,7 @@
$T3_VAR = array(); // Initialize.
// TYPO3 version
-$TYPO_VERSION = '4.5.16'; // deprecated: use the constants defined below
+$TYPO_VERSION = '4.5.17'; // deprecated: use the constants defined below
define('TYPO3_version', $TYPO_VERSION);
define('TYPO3_branch', '4.5');
define('TYPO3_copyright_year', '1998-2012');
diff -Naurw blankpackage-4.5.16/t3lib/jsfunc.inline.js blankpackage-4.5.17/t3lib/jsfunc.inline.js
--- blankpackage-4.5.16/t3lib/jsfunc.inline.js 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/t3lib/jsfunc.inline.js 2012-07-04 11:19:29.000000000 +0200
@@ -407,10 +407,36 @@
}
},
domAddRecordDetails: function(objectId, objectPrefix, expandSingle, htmlData) {
+ var hiddenValue, formObj, valueObj;
var objectDiv = $(objectId + '_fields');
if (!objectDiv || objectDiv.innerHTML.substr(0,16) != '<!--notloaded-->')
return;
+
+ var elName = this.parseObjectId('full', objectId, 2, 0, true);
+
+ formObj = document.getElementsByName(elName + '[hidden]_0');
+ valueObj = document.getElementsByName(elName + '[hidden]');
+
+ // It might be the case that a child record
+ // cannot be hidden at all (no hidden field)
+ if (formObj.length && valueObj.length) {
+ hiddenValue = formObj[0].checked;
+ formObj[0].remove();
+ valueObj[0].remove();
+ }
+
+ // Update DOM
objectDiv.update(htmlData);
+
+ formObj = document.getElementsByName(elName + '[hidden]_0');
+ valueObj = document.getElementsByName(elName + '[hidden]');
+
+ // Set the hidden value again
+ if (formObj.length && valueObj.length) {
+ valueObj[0].value = hiddenValue ? 1 : 0;
+ formObj[0].checked = hiddenValue;
+ }
+
// remove loading-indicator
if ($(objectId + '_icon')) {
$(objectId + '_iconcontainer').removeClassName('loading-indicator');
@@ -707,16 +733,26 @@
},
enableDisableRecord: function(objectId) {
- var elName = this.parseObjectId('full', objectId, 2, 0, true);
- var imageObj = $(objectId+'_disabled');
- var valueObj = document.getElementsByName(elName+'[hidden]');
- var formObj = document.getElementsByName(elName+'[hidden]_0');
- var imagePath = '';
+ var elName = this.parseObjectId('full', objectId, 2, 0, true) + '[hidden]';
+ var formObj = document.getElementsByName(elName + '_0');
+ var valueObj = document.getElementsByName(elName);
+ var icon = $(objectId + '_disabled');
- if (valueObj && formObj) {
+ // It might be the case that there's no hidden field
+ if (formObj.length && valueObj.length) {
formObj[0].click();
- imagePath = this.parsePath(imageObj.src);
- imageObj.src = imagePath+(valueObj[0].value > 0 ? 'button_unhide.gif' : 'button_hide.gif');
+ valueObj[0].value = formObj[0].checked ? 1 : 0;
+ TBE_EDITOR.fieldChanged_fName(elName, elName);
+ }
+
+ if (icon) {
+ if (icon.hasClassName('t3-icon-edit-hide')) {
+ icon.removeClassName ('t3-icon-edit-hide');
+ icon.addClassName('t3-icon-edit-unhide');
+ } else {
+ icon.removeClassName ('t3-icon-edit-unhide');
+ icon.addClassName('t3-icon-edit-hide');
+ }
}
return false;
diff -Naurw blankpackage-4.5.16/t3lib/utility/class.t3lib_utility_phpoptions.php blankpackage-4.5.17/t3lib/utility/class.t3lib_utility_phpoptions.php
--- blankpackage-4.5.16/t3lib/utility/class.t3lib_utility_phpoptions.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/t3lib/utility/class.t3lib_utility_phpoptions.php 2012-07-04 11:19:29.000000000 +0200
@@ -41,8 +41,11 @@
* @return boolean TRUE if safe_mode is enabled, FALSE if disabled
*/
public static function isSafeModeEnabled() {
+ if (version_compare(phpversion(), '5.4', '<')) {
return self::getIniValueBoolean('safe_mode');
}
+ return FALSE;
+ }
/**
* Check if php sql.safe_mode is enabled
diff -Naurw blankpackage-4.5.16/.travis.yml blankpackage-4.5.17/.travis.yml
--- blankpackage-4.5.16/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ blankpackage-4.5.17/.travis.yml 2012-07-04 11:19:29.000000000 +0200
@@ -0,0 +1,12 @@
+language: php
+php:
+ - 5.3
+
+env:
+ - DB=mysql
+
+branches:
+ only:
+ - master
+
+
diff -Naurw blankpackage-4.5.16/typo3/init.php blankpackage-4.5.17/typo3/init.php
--- blankpackage-4.5.16/typo3/init.php 2012-05-22 12:03:07.000000000 +0200
+++ blankpackage-4.5.17/typo3/init.php 2012-07-04 11:19:25.000000000 +0200
@@ -66,11 +66,7 @@
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
// *******************************
// Prevent any unwanted output that may corrupt AJAX/compression. Note: this does
@@ -338,8 +334,10 @@
// *******************************
// Checking environment
// *******************************
-if (isset($_POST['GLOBALS']) || isset($_GET['GLOBALS'])) die('You cannot set the GLOBALS-array from outside the script.');
-if (!version_compare(phpversion(), '5.4', '<') || !get_magic_quotes_gpc()) {
+if (isset($_POST['GLOBALS']) || isset($_GET['GLOBALS'])) {
+ die('You cannot set the GLOBALS-array from outside the script.');
+}
+if (!get_magic_quotes_gpc()) {
t3lib_div::addSlashesOnArray($_GET);
t3lib_div::addSlashesOnArray($_POST);
$HTTP_GET_VARS = $_GET;
diff -Naurw blankpackage-4.5.16/typo3/install/index.php blankpackage-4.5.17/typo3/install/index.php
--- blankpackage-4.5.16/typo3/install/index.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/typo3/install/index.php 2012-07-04 11:19:29.000000000 +0200
@@ -40,11 +40,7 @@
// Insert some security here, if you don't trust the Install Tool Password:
// **************************************************************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
$PATH_thisScript = str_replace('//', '/', str_replace('\\', '/',
(PHP_SAPI == 'fpm-fcgi' || PHP_SAPI == 'cgi' || PHP_SAPI == 'isapi' || PHP_SAPI == 'cgi-fcgi') &&
diff -Naurw blankpackage-4.5.16/typo3/sysext/cms/ext_tables.php blankpackage-4.5.17/typo3/sysext/cms/ext_tables.php
--- blankpackage-4.5.16/typo3/sysext/cms/ext_tables.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/cms/ext_tables.php 2012-07-04 11:19:28.000000000 +0200
@@ -102,7 +102,7 @@
'html' => 'tt_content_html.gif'
),
'thumbnail' => 'image',
- 'requestUpdate' => 'list_type,rte_enabled',
+ 'requestUpdate' => 'list_type,rte_enabled,menu_type',
'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tbl_tt_content.php',
'dividers2tabs' => 1
)
diff -Naurw blankpackage-4.5.16/typo3/sysext/cms/tbl_tt_content.php blankpackage-4.5.17/typo3/sysext/cms/tbl_tt_content.php
--- blankpackage-4.5.16/typo3/sysext/cms/tbl_tt_content.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/cms/tbl_tt_content.php 2012-07-04 11:19:28.000000000 +0200
@@ -1809,6 +1809,10 @@
--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended',
+ 'subtype_value_field' => 'menu_type',
+ 'subtypes_excludelist' => array(
+ '2' => 'pages',
+ ),
),
'mailform' => array(
'showitem' =>
diff -Naurw blankpackage-4.5.16/typo3/sysext/cms/tslib/class.tslib_fe.php blankpackage-4.5.17/typo3/sysext/cms/tslib/class.tslib_fe.php
--- blankpackage-4.5.16/typo3/sysext/cms/tslib/class.tslib_fe.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/cms/tslib/class.tslib_fe.php 2012-07-04 11:19:28.000000000 +0200
@@ -279,12 +279,12 @@
JSImgCode : reserved
*/
var $additionalHeaderData=array(); // used to accumulate additional HTML-code for the header-section, <head>...</head>. Insert either associative keys (like additionalHeaderData['myStyleSheet'], see reserved keys above) or num-keys (like additionalHeaderData[] = '...')
+ public $additionalFooterData = array(); // used to accumulate additional HTML-code for the footer-section of the template
var $additionalJavaScript=array(); // used to accumulate additional JavaScript-code. Works like additionalHeaderData. Reserved keys at 'openPic' and 'mouseOver'
var $additionalCSS=array(); // used to accumulate additional Style code. Works like additionalHeaderData.
var $JSeventFuncCalls = array( // you can add JavaScript functions to each entry in these arrays. Please see how this is done in the GMENU_LAYERS script. The point is that many applications on a page can set handlers for onload, onmouseover and onmouseup
'onmousemove' => array(),
'onmouseup' => array(),
- 'onmousemove' => array(),
'onkeydown' => array(),
'onkeyup' => array(),
'onkeypress' => array(),
@@ -3212,6 +3212,7 @@
function INTincScript() {
// Deprecated stuff:
$this->additionalHeaderData = is_array($this->config['INTincScript_ext']['additionalHeaderData']) ? $this->config['INTincScript_ext']['additionalHeaderData'] : array();
+ $this->additionalFooterData = is_array($this->config['INTincScript_ext']['additionalFooterData']) ? $this->config['INTincScript_ext']['additionalFooterData'] : array();
$this->additionalJavaScript = $this->config['INTincScript_ext']['additionalJavaScript'];
$this->additionalCSS = $this->config['INTincScript_ext']['additionalCSS'];
$this->JSCode = $this->additionalHeaderData['JSCode'];
@@ -3230,6 +3231,7 @@
$GLOBALS['TT']->push('Substitute header section');
$this->INTincScript_loadJSCode();
$this->content = str_replace('<!--HD_'.$this->config['INTincScript_ext']['divKey'].'-->', $this->convOutputCharset(implode(LF,$this->additionalHeaderData),'HD'), $this->content);
+ $this->content = str_replace('<!--FD_'.$this->config['INTincScript_ext']['divKey'].'-->', $this->convOutputCharset(implode(LF, $this->additionalFooterData), 'FD'), $this->content);
$this->content = str_replace('<!--TDS_'.$this->config['INTincScript_ext']['divKey'].'-->', $this->convOutputCharset($this->divSection,'TDS'), $this->content);
$this->setAbsRefPrefix();
$GLOBALS['TT']->pull();
diff -Naurw blankpackage-4.5.16/typo3/sysext/cms/tslib/class.tslib_pagegen.php blankpackage-4.5.17/typo3/sysext/cms/tslib/class.tslib_pagegen.php
--- blankpackage-4.5.16/typo3/sysext/cms/tslib/class.tslib_pagegen.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/cms/tslib/class.tslib_pagegen.php 2012-07-04 11:19:28.000000000 +0200
@@ -837,11 +837,13 @@
$GLOBALS['TSFE']->additionalHeaderData['JSImgCode'] = $GLOBALS['TSFE']->JSImgCode;
$GLOBALS['TSFE']->config['INTincScript_ext']['divKey'] = $GLOBALS['TSFE']->uniqueHash();
$GLOBALS['TSFE']->config['INTincScript_ext']['additionalHeaderData'] = $GLOBALS['TSFE']->additionalHeaderData; // Storing the header-data array
+ $GLOBALS['TSFE']->config['INTincScript_ext']['additionalFooterData'] = $GLOBALS['TSFE']->additionalFooterData; // Storing the footer-data array
$GLOBALS['TSFE']->config['INTincScript_ext']['additionalJavaScript'] = $GLOBALS['TSFE']->additionalJavaScript; // Storing the JS-data array
$GLOBALS['TSFE']->config['INTincScript_ext']['additionalCSS'] = $GLOBALS['TSFE']->additionalCSS; // Storing the Style-data array
$GLOBALS['TSFE']->additionalHeaderData = array ('<!--HD_' . $GLOBALS['TSFE']->config['INTincScript_ext']['divKey'] . '-->'); // Clearing the array
+ $GLOBALS['TSFE']->additionalFooterData = array ('<!--FD_' . $GLOBALS['TSFE']->config['INTincScript_ext']['divKey'] . '-->'); // Clearing the array
$GLOBALS['TSFE']->divSection .= '<!--TDS_' . $GLOBALS['TSFE']->config['INTincScript_ext']['divKey'] . '-->';
} else {
$GLOBALS['TSFE']->INTincScript_loadJSCode();
diff -Naurw blankpackage-4.5.16/typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc blankpackage-4.5.17/typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc
--- blankpackage-4.5.16/typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc 2012-07-04 11:19:28.000000000 +0200
@@ -1491,7 +1491,7 @@
*/
function sendHTMLMail($content,$recipient,$dummy,$fromEmail,$fromName,$replyTo='') {
if (trim($recipient) && trim($content)) {
- $parts = preg_split('<title>|</title>', $content, 3);
+ $parts = preg_split('/<title>|<\/title>/i', $content, 3);
$subject = trim($parts[1]) ? trim($parts[1]) : 'TYPO3 FE Admin message';
$Typo3_htmlmail = t3lib_div::makeInstance('t3lib_htmlmail');
diff -Naurw blankpackage-4.5.16/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php blankpackage-4.5.17/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
--- blankpackage-4.5.16/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php 2012-07-04 11:19:28.000000000 +0200
@@ -191,7 +191,7 @@
}
if (!strcmp(trim($cells[$a]),'')) $cells[$a]=' ';
- $cellAttribs = ($noStyles?'':($a>0 && ($cols-1)==$a) ? ' class="td-last td-'.$a.'"' : ' class="td-'.$a.'"');
+ $cellAttribs = ($noStyles ? '' : (($a > 0 && ($cols - 1) == $a) ? ' class="td-last td-' . $a . '"' : ' class="td-' . $a . '"'));
if (($headerPos == 'top' && !$k) || ($headerPos == 'left' && !$a)) {
$scope = ' scope="'.$headerScope.'"';
$scope .= ' id="'.$headerIdPrefix.(($headerScope=='col')?$a:$k).'"';
diff -Naurw blankpackage-4.5.16/typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php blankpackage-4.5.17/typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php
--- blankpackage-4.5.16/typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php 2012-05-22 12:03:09.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php 2012-07-04 11:19:26.000000000 +0200
@@ -300,7 +300,10 @@
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('change_password_done_message', $this->conf['changePasswordMessage_stdWrap.']);
$done = true;
$subpartArray['###CHANGEPASSWORD_FORM###'] = '';
- $markerArray['###BACKLINK_LOGIN###'] = $this->getPageLink($this->pi_getLL('ll_forgot_header_backToLogin', '', 1), array());
+ $markerArray['###BACKLINK_LOGIN###'] = $this->getPageLink(
+ $this->pi_getLL('ll_forgot_header_backToLogin', '', 1),
+ array($this->prefixId . '[redirectReferrer]' => 'off')
+ );
}
}
@@ -486,6 +489,9 @@
$referer = $this->referer ? $this->referer : t3lib_div::getIndpEnv('HTTP_REFERER');
if ($referer) {
$extraHiddenAr[] = '<input type="hidden" name="referer" value="' . htmlspecialchars($referer) . '" />';
+ if ($this->piVars['redirectReferrer'] === 'off') {
+ $extraHiddenAr[] = '<input type="hidden" name="' . $this->prefixId . '[redirectReferrer]" value="off" />';
+ }
}
}
@@ -589,15 +595,19 @@
$redirect_url[] = $this->redirectUrl;
break;
case 'referer':
+ // avoid redirect when logging in after changing password
+ if ($this->piVars['redirectReferrer'] !== 'off') {
// avoid forced logout, when trying to login immediatly after a logout
$redirect_url[] = preg_replace('/[&?]logintype=[a-z]+/', '', $this->referer);
+ }
break;
case 'refererDomains':
// Auto redirect.
// Feature to redirect to the page where the user came from (HTTP_REFERER).
// Allowed domains to redirect to, can be configured with plugin.tx_felogin_pi1.domains
// Thanks to plan2.net / Martin Kutschker for implementing this feature.
- if ($this->conf['domains']) {
+ // also avoid redirect when logging in after changing password
+ if ($this->conf['domains'] && $this->piVars['redirectReferrer'] !== 'off') {
$url = $this->referer;
// is referring url allowed to redirect?
$match = array();
diff -Naurw blankpackage-4.5.16/typo3/sysext/linkvalidator/classes/tasks/class.tx_linkvalidator_tasks_validator.php blankpackage-4.5.17/typo3/sysext/linkvalidator/classes/tasks/class.tx_linkvalidator_tasks_validator.php
--- blankpackage-4.5.16/typo3/sysext/linkvalidator/classes/tasks/class.tx_linkvalidator_tasks_validator.php 2012-05-22 12:03:09.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/linkvalidator/classes/tasks/class.tx_linkvalidator_tasks_validator.php 2012-07-04 11:19:26.000000000 +0200
@@ -272,31 +272,46 @@
}
/**
- * Validate all links for a page based on the task configuration.
+ * Validate all links for a page based on the task configuration
*
- * @param integer $page: uid of the page to parse.
- * @return string $pageSections: Content of page section.
+ * @param integer $page Uid of the page to parse
+ * @return string $pageSections Content of page section
*/
protected function checkPageLinks($page) {
+ $page = intval($page);
$pageSections = '';
+ $pageIds = '';
+ $oldLinkCounts = array();
+
$modTS = $this->loadModTSconfig($page);
$searchFields = $this->getSearchField($modTS);
$linkTypes = $this->getLinkTypes($modTS);
+
+ /** @var tx_linkvalidator_processor $processor */
$processor = t3lib_div::makeInstance('tx_linkvalidator_Processor');
+
+ if ($page === 0) {
+ $rootLineHidden = FALSE;
+ } else {
$pageRow = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*', 'pages', 'uid=' . $page);
$rootLineHidden = $processor->getRootLineIsHidden($pageRow);
+ }
+
if (!$rootLineHidden || $modTS['checkhidden']==1) {
$pageIds = $processor->extGetTreeList($page, $this->depth, 0, '1=1', $modTS['checkhidden']);
if ($pageRow['hidden'] == 0 || $modTS['checkhidden']==1) {
+ // tx_linkvalidator_Processor::extGetTreeList always adds trailing comma:
$pageIds .= $page;
}
+ }
+ if (!empty($pageIds)) {
$processor->init($searchFields, $pageIds);
+
if (!empty($this->email)) {
$oldLinkCounts = $processor->getLinkCounts($page);
$this->oldTotalBrokenLink += $oldLinkCounts['brokenlinkCount'];
}
- }
$processor->getLinkStatistics($linkTypes, $modTS['checkhidden']);
@@ -305,6 +320,8 @@
$this->totalBrokenLink += $linkCounts['brokenlinkCount'];
$pageSections = $this->buildMail($page, $pageIds, $linkCounts, $oldLinkCounts);
}
+ }
+
return $pageSections;
}
diff -Naurw blankpackage-4.5.16/typo3/sysext/linkvalidator/modfuncreport/class.tx_linkvalidator_modfuncreport.php blankpackage-4.5.17/typo3/sysext/linkvalidator/modfuncreport/class.tx_linkvalidator_modfuncreport.php
--- blankpackage-4.5.16/typo3/sysext/linkvalidator/modfuncreport/class.tx_linkvalidator_modfuncreport.php 2012-05-22 12:03:09.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/linkvalidator/modfuncreport/class.tx_linkvalidator_modfuncreport.php 2012-07-04 11:19:26.000000000 +0200
@@ -443,9 +443,9 @@
$GLOBALS['BE_USER']->getPagePermsClause(1),
$this->modTS['checkhidden']
);
- if ($this->pObj->pageinfo['hidden'] == 0 || $this->modTS['checkhidden']==1){
+
+ // Always add the current page, because we are just displaying the results
$pageList .= $this->pObj->id;
- }
if (($res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'*',
diff -Naurw blankpackage-4.5.16/typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php blankpackage-4.5.17/typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php
--- blankpackage-4.5.16/typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php 2012-05-22 12:03:10.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php 2012-07-04 11:19:27.000000000 +0200
@@ -56,9 +56,13 @@
$statuses = array(
'emptyReferenceIndex' => $this->getReferenceIndexStatus(),
'deprecationLog' => $this->getDeprecationLogStatus(),
- 'safeModeEnabled' => $this->getPhpSafeModeStatus()
);
+ // Do not show status about non-existant features
+ if (version_compare(phpversion(), '5.4', '<')) {
+ $statuses['safeModeEnabled'] = $this->getPhpSafeModeStatus();
+ }
+
if ($this->isMemcachedUsed()) {
$statuses['memcachedConnection'] = $this->getMemcachedConnectionStatus();
}
diff -Naurw blankpackage-4.5.16/typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php blankpackage-4.5.17/typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php
--- blankpackage-4.5.16/typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php 2012-05-22 12:03:10.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php 2012-07-04 11:19:27.000000000 +0200
@@ -263,10 +263,12 @@
$severity = tx_reports_reports_status_Status::ERROR;
$messageDetail .= $flashMessage;
}
- if (strpos($flashMessage, 'message-warning') !== FALSE ||
- strpos($flashMessage, 'message-information') !== FALSE) {
+ if (strpos($flashMessage, 'message-warning') !== FALSE) {
$severity = tx_reports_reports_status_Status::WARNING;
- $message .= $flashMessage;
+ $messageDetail .= $flashMessage;
+ }
+ if (strpos($flashMessage, 'message-information') !== FALSE) {
+ $messageDetail .= $flashMessage;
}
$unsecureUserCount = tx_saltedpasswords_div::getNumberOfBackendUsersWithInsecurePassword();
diff -Naurw blankpackage-4.5.16/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php blankpackage-4.5.17/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
--- blankpackage-4.5.16/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php 2012-07-04 11:19:28.000000000 +0200
@@ -230,8 +230,7 @@
* @param integer PID value of record (true parent page id)
* @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 $BE_USER, $LANG, $TYPO3_DB, $TYPO3_CONF_VARS;
$this->TCEform = $parentObject;
@@ -917,6 +916,14 @@
$configureRTEInJavascriptString .= '
RTEarea[editornumber].htmlRemoveTagsAndContents = /^(' . implode('|', t3lib_div::trimExplode(',', $this->thisConfig['removeTagsAndContents'], 1)) . ')$/i;';
}
+ // Setting array of custom tags if specified in the RTE config
+ if (!empty($this->thisConfig['customTags'])) {
+ $customTags = t3lib_div::trimExplode(',', $this->thisConfig['customTags'], 1);
+ if (!empty($customTags)) {
+ $configureRTEInJavascriptString .= '
+ RTEarea[editornumber].customTags= ' . json_encode($customTags) . ';';
+ }
+ }
// Process default style configuration
$configureRTEInJavascriptString .= '
RTEarea[editornumber].defaultPageStyle = "' . $this->writeTemporaryFile('', 'defaultPageStyle', 'css', $this->buildStyleSheet()) . '";';
diff -Naurw blankpackage-4.5.16/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js blankpackage-4.5.17/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
--- blankpackage-4.5.16/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js 2012-07-04 11:19:28.000000000 +0200
@@ -64,6 +64,10 @@
RE_noClosingTag : /^(img|br|hr|col|input|area|base|link|meta|param)$/i,
RE_numberOrPunctuation : /[0-9.(),;:!¡?¿%#$'"_+=\\\/-]*/g,
/***************************************************
+ * BROWSER IDENTIFICATION *
+ ***************************************************/
+ isIEBeforeIE9: Ext.isIE6 || Ext.isIE7 || Ext.isIE8 || (Ext.isIE && typeof(document.documentMode) !== 'undefined' && document.documentMode < 9),
+ /***************************************************
* TROUBLESHOOTING *
***************************************************/
_appendToLog: function(str){
@@ -126,8 +130,8 @@
this.htmlRemoveTagsAndContents = /none/i;
// Remove comments
this.htmlRemoveComments = false;
- // Custom tags (must be a regular expression)
- this.customTags = /none/i;
+ // Array of custom tags
+ this.customTags = [];
// BaseURL to be included in the iframe document
this.baseURL = document.baseURI;
// IE does not support document.baseURI
@@ -930,11 +934,25 @@
this.getEditor().document = this.document;
this.getEditor()._doc = this.document;
this.getEditor()._iframe = iframe;
+ this.initializeCustomTags();
this.createHead();
this.getStyleSheets();
}
},
/*
+ * Create one of each of the configured custom tags so they are properly parsed by the walker when using IE
+ * See: http://en.wikipedia.org/wiki/HTML5_Shiv
+ *
+ * @return void
+ */
+ initializeCustomTags: function () {
+ if (HTMLArea.isIEBeforeIE9) {
+ Ext.each(this.config.customTags, function (tag) {
+ this.document.createElement(tag);
+ }, this);
+ }
+ },
+ /*
* Build the iframe document head
*/
createHead: function () {
@@ -1001,7 +1019,7 @@
}
} else {
// Test if the styleSheets array is at all accessible
- if (Ext.isIE) {
+ if (HTMLArea.isIEBeforeIE9) {
try {
var rules = this.document.styleSheets[0].rules;
var imports = this.document.styleSheets[0].imports;
@@ -1026,12 +1044,12 @@
// Expecting 3 stylesheets...
if (this.document.styleSheets.length > 2) {
Ext.each(this.document.styleSheets, function (styleSheet, index) {
- if (Ext.isIE) {
+ if (HTMLArea.isIEBeforeIE9) {
try {
var rules = styleSheet.rules;
var imports = styleSheet.imports;
// Default page style may contain only a comment
- if (!rules.length && !imports.length && index != 1) {
+ if (!rules.length && !imports.length && styleSheet.href.indexOf('defaultPageStyle') === -1) {
stylesAreLoaded = false;
errorText = 'Empty rules and imports arrays of styleSheets[' + index + ']';
return false;
diff -Naurw blankpackage-4.5.16/typo3/sysext/rtehtmlarea/mod3/browse_links.php blankpackage-4.5.17/typo3/sysext/rtehtmlarea/mod3/browse_links.php
--- blankpackage-4.5.16/typo3/sysext/rtehtmlarea/mod3/browse_links.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/rtehtmlarea/mod3/browse_links.php 2012-07-04 11:19:27.000000000 +0200
@@ -38,7 +38,7 @@
* @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*/
-error_reporting (E_ALL ^ E_NOTICE);
+error_reporting(E_ALL & ~(E_STRICT | E_NOTICE));
unset($MCONF);
require('conf.php');
require($BACK_PATH.'init.php');
diff -Naurw blankpackage-4.5.16/typo3/sysext/rtehtmlarea/mod4/select_image.php blankpackage-4.5.17/typo3/sysext/rtehtmlarea/mod4/select_image.php
--- blankpackage-4.5.16/typo3/sysext/rtehtmlarea/mod4/select_image.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/rtehtmlarea/mod4/select_image.php 2012-07-04 11:19:27.000000000 +0200
@@ -34,7 +34,7 @@
* $Id$ *
*/
-error_reporting (E_ALL ^ E_NOTICE);
+error_reporting(E_ALL & ~(E_STRICT | E_NOTICE));
unset($MCONF);
require('conf.php');
require($BACK_PATH.'init.php');
diff -Naurw blankpackage-4.5.16/typo3/sysext/rtehtmlarea/mod5/user.php blankpackage-4.5.17/typo3/sysext/rtehtmlarea/mod5/user.php
--- blankpackage-4.5.16/typo3/sysext/rtehtmlarea/mod5/user.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/rtehtmlarea/mod5/user.php 2012-07-04 11:19:27.000000000 +0200
@@ -34,7 +34,7 @@
* $Id$ *
*/
-error_reporting (E_ALL ^ E_NOTICE);
+error_reporting(E_ALL & ~(E_STRICT | E_NOTICE));
unset($MCONF);
require('conf.php');
require($BACK_PATH.'init.php');
diff -Naurw blankpackage-4.5.16/typo3/sysext/rtehtmlarea/mod6/parse_html.php blankpackage-4.5.17/typo3/sysext/rtehtmlarea/mod6/parse_html.php
--- blankpackage-4.5.16/typo3/sysext/rtehtmlarea/mod6/parse_html.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/rtehtmlarea/mod6/parse_html.php 2012-07-04 11:19:27.000000000 +0200
@@ -32,7 +32,7 @@
* $Id$ *
*/
-error_reporting (E_ALL ^ E_NOTICE);
+error_reporting(E_ALL & ~(E_STRICT | E_NOTICE));
unset($MCONF);
require ('conf.php');
require ($BACK_PATH.'init.php');
diff -Naurw blankpackage-4.5.16/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php blankpackage-4.5.17/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
--- blankpackage-4.5.16/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php 2012-05-22 12:03:11.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php 2012-07-04 11:19:27.000000000 +0200
@@ -70,7 +70,7 @@
* @param integer PID value of record (true parent page id)
* @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 $TSFE, $TYPO3_CONF_VARS, $TYPO3_DB;
$this->TCEform = $parentObject;
diff -Naurw blankpackage-4.5.16/typo3/sysext/sys_action/task/class.tx_sysaction_task.php blankpackage-4.5.17/typo3/sysext/sys_action/task/class.tx_sysaction_task.php
--- blankpackage-4.5.16/typo3/sysext/sys_action/task/class.tx_sysaction_task.php 2012-05-22 12:03:08.000000000 +0200
+++ blankpackage-4.5.17/typo3/sysext/sys_action/task/class.tx_sysaction_task.php 2012-07-04 11:19:25.000000000 +0200
@@ -722,7 +722,7 @@
foreach($grList as $group) {
$checkGroup = t3lib_BEfunc::getRecord('be_groups', $group);
if (is_array($checkGroup)) {
- $selected = (is_array($vars['usergroup']) && t3lib_div::inList(implode(',', $vars['usergroup']), $checkGroup['uid'])) ? ' selected="selected" ' : '';
+ $selected = t3lib_div::inList($vars['usergroup'], $checkGroup['uid']) ? ' selected="selected" ' : '';
$content .= '<option ' . $selected . 'value="' . $checkGroup['uid'] . '">' . htmlspecialchars($checkGroup['title']) . '</option>';
}
}
diff -Naurw blankpackage-4.5.16/typo3/template.php blankpackage-4.5.17/typo3/template.php
--- blankpackage-4.5.16/typo3/template.php 2012-05-22 12:03:12.000000000 +0200
+++ blankpackage-4.5.17/typo3/template.php 2012-07-04 11:19:29.000000000 +0200
@@ -2093,7 +2093,7 @@
*/
protected function getPagePath($pageRecord) {
// Is this a real page
- if ($pageRecord['uid']) {
+ if (is_array($pageRecord) && $pageRecord['uid']) {
$title = substr($pageRecord['_thePathFull'], 0, -1);
// remove current page title
$pos = strrpos($title, '/');
@@ -2128,7 +2128,7 @@
protected function getPageInfo($pageRecord) {
global $BE_USER;
// Add icon with clickmenu, etc:
- if ($pageRecord['uid']) { // If there IS a real page
+ if (is_array($pageRecord) && $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:
diff -Naurw blankpackage-4.5.16/typo3/thumbs.php blankpackage-4.5.17/typo3/thumbs.php
--- blankpackage-4.5.16/typo3/thumbs.php 2012-05-22 12:03:07.000000000 +0200
+++ blankpackage-4.5.17/typo3/thumbs.php 2012-07-04 11:19:25.000000000 +0200
@@ -35,12 +35,8 @@
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
define('PATH_thisScript', str_replace('//', '/', str_replace('\\', '/',
(PHP_SAPI == 'fpm-fcgi' || PHP_SAPI == 'cgi' || PHP_SAPI == 'isapi' || PHP_SAPI == 'cgi-fcgi') &&
Reply to: