[5.1] Guided tours welcome performance (#43166)

Author: obuisard

administrator/components/com_guidedtours/src/Model/TourModel.php

@@ -510,7 +510,7 @@ protected function setStepsLanguage(int $id, string $language = '*'): bool
      * @param   int  $id         Id of a tour
      * @param   int  $autostart  The autostart value of a tour
      *
-     * @since  5.0.0
+     * @since  __DEPLOY_VERSION__
      */
     public function setAutostart($id, $autostart)
     {
@@ -526,4 +526,36 @@ public function setAutostart($id, $autostart)
         $db->setQuery($query);
         $db->execute();
     }
+
+    /**
+     * Retrieve a tour's autostart value
+     *
+     * @param   string  $uid  the uid of a tour
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function isAutostart($uid)
+    {
+        $db = $this->getDatabase();
+
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('autostart'))
+            ->from($db->quoteName('#__guidedtours'))
+            ->where($db->quoteName('published') . ' = 1')
+            ->where($db->quoteName('uid') . ' = :uid')
+            ->bind(':uid', $uid, ParameterType::STRING);
+
+        $db->setQuery($query);
+
+        try {
+            $result = $db->loadResult();
+            if ($result === null) {
+                return false;
+            }
+        } catch (\RuntimeException $e) {
+            return false;
+        }
+
+        return $result;
+    }
 }

plugins/system/guidedtours/src/Extension/GuidedTours.php

@@ -161,20 +161,20 @@ public function onBeforeCompileHead()
 
             // Temporary solution to auto-start the welcome tour
             if ($app->getInput()->getCmd('option', 'com_cpanel') === 'com_cpanel') {
-                $tour = $this->getTour('joomla-welcome');
+                $factory = $app->bootComponent('com_guidedtours')->getMVCFactory();
 
-                if ($tour && $tour->autostart) {
-                    $doc->addScriptOptions('com_guidedtours.autotour', $tour->id);
+                $tourModel = $factory->createModel(
+                    'Tour',
+                    'Administrator',
+                    ['ignore_request' => true]
+                );
 
-                    // Set autostart to '0' to avoid it to autostart again
-                    $factory = $app->bootComponent('com_guidedtours')->getMVCFactory();
+                if ($tourModel->isAutostart('joomla-welcome')) {
+                    $tour = $this->getTour('joomla-welcome');
 
-                    $tourModel = $factory->createModel(
-                        'Tour',
-                        'Administrator',
-                        ['ignore_request' => true]
-                    );
+                    $doc->addScriptOptions('com_guidedtours.autotour', $tour->id);
 
+                    // Set autostart to '0' to avoid it to autostart again
                     $tourModel->setAutostart($tour->id, 0);
                 }
             }