[6.1] Improve Multilanguage::getSiteHomePages() (#41507)

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Quy <quy@nomonkeybiz.com>
Co-authored-by: Robert Deutz <rdeutz@googlemail.com>

Author: 4 people

libraries/src/Language/Multilanguage.php

@@ -11,6 +11,8 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Menu\MenuItem;
+use Joomla\CMS\Menu\SiteMenu;
 use Joomla\Database\DatabaseInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -89,40 +91,15 @@ public static function isEnabled(?CMSApplication $app = null, ?DatabaseInterface
     /**
      * Method to return a list of language home page menu items.
      *
-     * @param   ?DatabaseInterface  $db  The database
-     *
-     * @return  array of menu objects.
+     * @return  MenuItem[] array of menu item objects.
      *
      * @since   3.5
      */
-    public static function getSiteHomePages(?DatabaseInterface $db = null)
+    public static function getSiteHomePages()
     {
-        // To avoid doing duplicate database queries.
-        static $multilangSiteHomePages = null;
-
-        if (!isset($multilangSiteHomePages)) {
-            // Check for Home pages languages.
-            $db    = $db ?: Factory::getDbo();
-            $query = $db->createQuery()
-                ->select(
-                    [
-                        $db->quoteName('language'),
-                        $db->quoteName('id'),
-                    ]
-                )
-                ->from($db->quoteName('#__menu'))
-                ->where(
-                    [
-                        $db->quoteName('home') . ' = ' . $db->quote('1'),
-                        $db->quoteName('published') . ' = 1',
-                        $db->quoteName('client_id') . ' = 0',
-                    ]
-                );
-            $db->setQuery($query);
-
-            $multilangSiteHomePages = $db->loadObjectList('language');
-        }
+        /** @var SiteMenu $menu */
+        $menu = Factory::getApplication()->getMenu('site');
 
-        return $multilangSiteHomePages;
+        return $menu->getHomepages();
     }
 }

libraries/src/Menu/AbstractMenu.php

@@ -395,6 +395,27 @@ protected function getUser()
             : $this->storedUser;
     }
 
+    /**
+     * Returns homepages per language.
+     *
+     * @return  MenuItem[]
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function getHomepages()
+    {
+        // Ensure that defaults are filled.
+        $this->getMenu();
+
+        $homepages = [];
+
+        foreach ($this->default as $language => $id) {
+            $homepages[$language] = $this->items[$id];
+        }
+
+        return $homepages;
+    }
+
     /**
      * Magic getter for the user object. Returns the injected
      * one if any, or the current one if none.

libraries/src/Menu/SiteMenu.php

@@ -191,7 +191,7 @@ public function load()
             return false;
         }
 
-        foreach ($this->items as &$item) {
+        foreach ($this->items as $item) {
             // Get parent information.
             $parent_tree = [];