From 9460dc303b2abc7f9e8f22419981abb7bb06894d Mon Sep 17 00:00:00 2001
From: Benjamin Mack <benni@typo3.org>
Date: Sat, 28 Feb 2015 21:52:45 +0100
Subject: [PATCH] [FOLLOWUP][TASK] Move Media cObject and CTypes
Missed some removal of old classes,
also make sure that they are registered for FE and BE.
Resolves: #64719
Releases: master
Change-Id: I416d1a9fa19aacb5950e8f33e0e085b020f4d242
Reviewed-on: http://review.typo3.org/37377
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
---
typo3/sysext/frontend/ext_localconf.php | 5 -----
typo3/sysext/mediace/ext_localconf.php | 14 ++++++--------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/typo3/sysext/frontend/ext_localconf.php b/typo3/sysext/frontend/ext_localconf.php
index 3026fce9e7fe..61463916133c 100644
--- a/typo3/sysext/frontend/ext_localconf.php
+++ b/typo3/sysext/frontend/ext_localconf.php
@@ -48,11 +48,6 @@ if (TYPO3_MODE === 'FE') {
'RESTORE_REGISTER' => \TYPO3\CMS\Frontend\ContentObject\RestoreRegisterContentObject::class,
'TEMPLATE' => \TYPO3\CMS\Frontend\ContentObject\TemplateContentObject::class,
'FLUIDTEMPLATE' => \TYPO3\CMS\Frontend\ContentObject\FluidTemplateContentObject::class,
- 'MULTIMEDIA' => \TYPO3\CMS\Frontend\ContentObject\MultimediaContentObject::class,
- 'MEDIA' => \TYPO3\CMS\Frontend\ContentObject\MediaContentObject::class,
- 'SWFOBJECT' => \TYPO3\CMS\Frontend\ContentObject\ShockwaveFlashObjectContentObject::class,
- 'FLOWPLAYER' => \TYPO3\CMS\Frontend\ContentObject\FlowPlayerContentObject::class,
- 'QTOBJECT' => \TYPO3\CMS\Frontend\ContentObject\QuicktimeObjectContentObject::class,
'SVG' => \TYPO3\CMS\Frontend\ContentObject\ScalableVectorGraphicsContentObject::class,
'EDITPANEL' => \TYPO3\CMS\Frontend\ContentObject\EditPanelContentObject::class
));
diff --git a/typo3/sysext/mediace/ext_localconf.php b/typo3/sysext/mediace/ext_localconf.php
index 9499bf49c0d8..49d133fe0f62 100644
--- a/typo3/sysext/mediace/ext_localconf.php
+++ b/typo3/sysext/mediace/ext_localconf.php
@@ -1,14 +1,12 @@
<?php
defined('TYPO3_MODE') or die();
-if (TYPO3_MODE === 'FE') {
- // Register additional content objects
- $GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['MULTIMEDIA'] = \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject::class;
- $GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['MEDIA'] = \TYPO3\CMS\Mediace\ContentObject\MediaContentObject::class;
- $GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['SWFOBJECT'] = \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class;
- $GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['FLOWPLAYER'] = \TYPO3\CMS\Mediace\ContentObject\FlowPlayerContentObject::class;
- $GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['QTOBJECT'] = \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject::class;
-}
+// Register additional content objects
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['MULTIMEDIA'] = \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['MEDIA'] = \TYPO3\CMS\Mediace\ContentObject\MediaContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['SWFOBJECT'] = \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['FLOWPLAYER'] = \TYPO3\CMS\Mediace\ContentObject\FlowPlayerContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['QTOBJECT'] = \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject::class;
// Register the "media" CType to the "New Content Element" wizard
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
--
GitLab