[TASK] RTE: Inline ext_localconf includes 35/40535/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Mon, 22 Jun 2015 18:37:11 +0000 (20:37 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Tue, 23 Jun 2015 06:44:18 +0000 (08:44 +0200)
Merge two include_once calls directly into ext_localconf
of ext:rtehtmlarea. Do not treat SoftReferenceHook as
singleton anymore and substitute $_EXTKEY with rtehtmlarea.

Resolves: #67683
Releases: master
Change-Id: I08cbc4351e9b0c56087b2ed4608d1df938c24476
Reviewed-on: http://review.typo3.org/40535
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/rtehtmlarea/Configuration/Hook/SoftReferences/ext_localconf.php [deleted file]
typo3/sysext/rtehtmlarea/Configuration/Hook/StatusReport/ext_localconf.php [deleted file]
typo3/sysext/rtehtmlarea/ext_localconf.php

diff --git a/typo3/sysext/rtehtmlarea/Configuration/Hook/SoftReferences/ext_localconf.php b/typo3/sysext/rtehtmlarea/Configuration/Hook/SoftReferences/ext_localconf.php
deleted file mode 100644 (file)
index de8706a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-defined('TYPO3_MODE') or die();
-
-// Registering soft reference parser for img tags in RTE content
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser']['rtehtmlarea_images'] = '&TYPO3\\CMS\\Rtehtmlarea\\Hook\\SoftReferenceHook';
diff --git a/typo3/sysext/rtehtmlarea/Configuration/Hook/StatusReport/ext_localconf.php b/typo3/sysext/rtehtmlarea/Configuration/Hook/StatusReport/ext_localconf.php
deleted file mode 100644 (file)
index 238cdad..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-defined('TYPO3_MODE') or die();
-
-if (TYPO3_MODE === 'BE') {
-       // Take note of conflicting extensions
-       $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$_EXTKEY]['conflicts'] = $EM_CONF[$_EXTKEY]['constraints']['conflicts'];
-       // Register Status Report Hook
-       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['htmlArea RTE'][] = \TYPO3\CMS\Rtehtmlarea\Hook\StatusReportConflictsCheckHook::class;
-}
index 00d6b61..f606f4f 100644 (file)
@@ -34,10 +34,16 @@ if (strstr($_EXTCONF['defaultConfiguration'], 'Minimal')) {
 // Add default User TS Config RTE configuration
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:rtehtmlarea/Configuration/UserTS/' . $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['defaultConfiguration'] . '/userTSConfig.txt">');
 
-// Add processing of soft references on image tags in RTE content
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('rtehtmlarea') . 'Configuration/Hook/SoftReferences/ext_localconf.php';
+// Registering soft reference parser for image tags in RTE content
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser']['rtehtmlarea_images'] = \TYPO3\CMS\Rtehtmlarea\Hook\SoftReferenceHook::class;
+
 // Add Status Report about Conflicting Extensions
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('rtehtmlarea') . 'Configuration/Hook/StatusReport/ext_localconf.php';
+if (TYPO3_MODE === 'BE') {
+       // Take note of conflicting extensions
+       $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['conflicts'] = $EM_CONF['rtehtmlarea']['constraints']['conflicts'];
+       // Register Status Report Hook
+       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['htmlArea RTE'][] = \TYPO3\CMS\Rtehtmlarea\Hook\StatusReportConflictsCheckHook::class;
+}
 
 // Set warning in the Update Wizard of the Install Tool for deprecated Page TS Config properties
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['checkForDeprecatedRtePageTSConfigProperties'] = \TYPO3\CMS\Rtehtmlarea\Hook\Install\DeprecatedRteProperties::class;