Merge branch '5.4-dev' into 5.4/ci/add-php8.5

Author: HLeithner

components/com_content/src/Model/CategoryModel.php

@@ -16,6 +16,7 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Table\Table;
 use Joomla\Component\Content\Site\Helper\QueryHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -233,6 +234,17 @@ public function getItems()
         $limit = $this->getState('list.limit');
 
         if ($this->_articles === null && $category = $this->getCategory()) {
+            /**
+             * Special case for blog layout with limit 0 - don't load articles for performance reasons. We also need to
+             * create an empty pagination object to avoid fatal errors in the view.
+             */
+            if ($limit == 0 && $this->getState('view.layout') === 'blog') {
+                $this->_articles   = [];
+                $this->_pagination = new Pagination(0, 0, 0);
+
+                return $this->_articles;
+            }
+
             $model = $this->bootComponent('com_content')->getMVCFactory()
                 ->createModel('Articles', 'Site', ['ignore_request' => true]);
             $model->setState('params', Factory::getApplication()->getParams());

components/com_content/src/View/Category/HtmlView.php

@@ -72,6 +72,14 @@ class HtmlView extends CategoryView
      */
     public function display($tpl = null)
     {
+        /**
+         * Pass the current layout to the model so it can apply special handling for the
+         * blog layout. In the blog layout, if the total number of articles (leading +
+         * intro + links) is 0, we skip loading any articles to avoid the performance
+         * cost of loading all records when the limit is 0.
+         */
+        $this->getModel()->setState('view.layout', $this->getLayout());
+
         $this->commonCategoryDisplay();
 
         // Flag indicates to not add limitstart=0 to URL