don’t rely on previously set $active

trilbymedia · Feb 14, 2020 · 24fabe0 · 24fabe0
1 parent 7f0f749
commit 24fabe0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/tntsearch.php b/tntsearch.php
@@ -454,12 +454,11 @@ public static function indexJob(string $langCode = null)
         /** @var Language $language */
         $language = $grav['language'];
         $langEnabled = $language->enabled();
-        $active = $language->getActive();
 
         // TODO: can be removed when Grav minimum >= v1.6.22
         $hasReset = method_exists($pages, 'reset');
         if (!$hasReset && !$langCode) {
-            $langCode = $active;
+            $langCode = $language->getActive();
         }
 
         if ($langCode && (!$langEnabled || !$language->validate($langCode))) {
@@ -469,7 +468,7 @@ public static function indexJob(string $langCode = null)
         $langCodes = $langCode ? [$langCode] : $language->getLanguages();
         if ($langCodes) {
             foreach ($langCodes as $lang) {
-                if ($lang !== $active) {
+                if ($lang !== $language->getActive()) {
                     $language->init();
                     $language->setActive($lang);