Merge branch 'staging'

Lagerregal · Jun 2, 2020 · d74445b · d74445b
2 parents 23f4bfe + 5a18df6
commit d74445b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -11,7 +11,7 @@
   'conflicts' => '',
   'priority' => '',
   'module' => '',
-  'state' => 'stable',
+  'state' => 'beta',
   'internal' => '',
   'uploadfolder' => 0,
   'createDirs' => '',

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -57,10 +57,9 @@ function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding
         \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
     )->get('vhs');
 } else {
-    $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['vhs']['setup'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-        \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class
-    )->getCurrentConfiguration('vhs');
+    $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['vhs']['setup'] = unserialize($_EXTCONF);
 }
+
 if (!isset($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['vhs']['setup']['disableAssetHandling']) || !$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['vhs']['setup']['disableAssetHandling']) {
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['usePageCache'][] = 'FluidTYPO3\\Vhs\\Service\\AssetService';
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['contentPostProc-output'][] = 'FluidTYPO3\\Vhs\\Service\\AssetService->buildAllUncached';