Fix for drone

joomla · Dec 13, 2024 · d9c564f · d9c564f
1 parent 1ba336f
commit d9c564f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/administrator/modules/mod_guidedtours/tmpl/default.php b/administrator/modules/mod_guidedtours/tmpl/default.php
@@ -42,7 +42,7 @@
     elseif (in_array($extension, $tour->extensions)) :
         if ($extension === 'com_categories') :
             // Special case for the categories page, where the context is complemented with the extension the categories apply to
-            if ($uri->getVar('option', '') === 'com_categories') {
+            if ($uri->getVar('option', '') === 'com_categories') :
                 if ($uri->getVar('extension', '') === $app->getInput()->get('extension', '')) :
                     if ($contextCount > 0) :
                         $contextTours[] = $tour;
@@ -52,18 +52,20 @@
                     $listTours[] = $tour;
                     $toursCount--;
                 endif;
-            } elseif (in_array($app->getInput()->get('extension', ''), $tour->extensions)) {
-                if ($contextCount > 0) :
-                    $contextTours[] = $tour;
-                    $contextCount--;
+            else :
+                if (in_array($app->getInput()->get('extension', ''), $tour->extensions)) :
+                    if ($contextCount > 0) :
+                        $contextTours[] = $tour;
+                        $contextCount--;
+                    endif;
+                elseif ($toursCount > 0) :
+                    $listTours[] = $tour;
+                    $toursCount--;
                 endif;
-            }
-        elseif ($toursCount > 0) :
-                $listTours[] = $tour;
-                $toursCount--;
+            endif;
         elseif ($contextCount > 0) :
-                $contextTours[] = $tour;
-                $contextCount--;
+            $contextTours[] = $tour;
+            $contextCount--;
         endif;
     elseif ($toursCount > 0) :
         $listTours[] = $tour;

diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php
@@ -94,7 +94,9 @@
     require_once JPATH_LIBRARIES . '/loader.php';
 
     // If JLoader still does not exist panic.
-    throw new RuntimeException('Joomla Platform not loaded.');
+    if (!class_exists('JLoader')) {
+        throw new RuntimeException('Joomla Platform not loaded.');
+    }
 }
 
 // Setup the autoloaders.