bugfix rootline fields

DMKEBUSINESSGMBH · May 10, 2017 · 4fc83a2 · 4fc83a2
1 parent cd70c90
commit 4fc83a2
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/tests/class.tx_mksearch_tests_Util.php b/tests/class.tx_mksearch_tests_Util.php
@@ -66,7 +66,7 @@ class tx_mksearch_tests_Util
     /**
      * @var string
      */
-    private static $addRootLineFieldsBackup;
+    private static $addRootLineFieldsBackup = null;
 
     /**
      * Sichert die hoocks unt entfernt diese in der globalconf.
@@ -433,14 +433,29 @@ public static function emptyAddRootlineFields()
     {
         self::$addRootLineFieldsBackup = $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'];
         $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] = '';
+        if (tx_rnbase_util_TYPO3::isTYPO62OrHigher()) {
+            $property = new ReflectionProperty('TYPO3\\CMS\\Core\\Utility\\RootlineUtility', 'rootlineFields');
+            $property->setAccessible(true);
+            $rootLineFields = Tx_Rnbase_Utility_Strings::trimExplode(',', self::$addRootLineFieldsBackup, true);
+            $property->setValue(null, array_diff($property->getValue(null), $rootLineFields));
+        }
     }
 
     /**
      * @return void
      */
     public static function resetAddRootlineFields()
     {
-        $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] = self::$addRootLineFieldsBackup;
+        if (self::$addRootLineFieldsBackup != null) {
+            $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] = self::$addRootLineFieldsBackup;
+            if (tx_rnbase_util_TYPO3::isTYPO62OrHigher()) {
+                $property = new ReflectionProperty('TYPO3\\CMS\\Core\\Utility\\RootlineUtility', 'rootlineFields');
+                $property->setAccessible(true);
+                $rootLineFields = Tx_Rnbase_Utility_Strings::trimExplode(',', self::$addRootLineFieldsBackup, true);
+                $property->setValue(null, array_unique(array_merge($property->getValue(null), $rootLineFields)));
+            }
+            self::$addRootLineFieldsBackup = null;
+        }
     }
 }