Merge branch '5.4-dev' into 5.3-exceptions-backend1

Author: richard67

administrator/components/com_fields/src/Plugin/FieldsPlugin.php

@@ -46,7 +46,7 @@ abstract class FieldsPlugin extends CMSPlugin
      * @var    \Joomla\CMS\Application\CMSApplication
      * @since  4.0.0
      *
-     * @deprecated  __DEPLOY_VERSION__ will be removed in 7.0 use $this->getApplication() instead
+     * @deprecated  5.4.0 will be removed in 7.0 use $this->getApplication() instead
      */
     protected $app;
 

administrator/components/com_finder/src/Indexer/Query.php

@@ -733,8 +733,10 @@ protected function processDates($date1, $date2, $when1, $when2)
      */
     protected function processString($input, $lang, $mode)
     {
-        if ($input === null) {
-            $input = '';
+        $input = trim($input ?? '');
+
+        if ($input === '') {
+            return true;
         }
 
         // Clean up the input string.

administrator/components/com_finder/src/Indexer/Taxonomy.php

@@ -306,23 +306,29 @@ public static function addMap($linkId, $nodeId)
      */
     public static function getBranchTitles()
     {
-        $db = Factory::getDbo();
+        static $titles;
 
-        // Set user variables
-        $groups = implode(',', Factory::getUser()->getAuthorisedViewLevels());
+        if ($titles === null) {
+            $db = Factory::getDbo();
 
-        // Create a query to get the taxonomy branch titles.
-        $query = $db->getQuery(true)
-            ->select($db->quoteName('title'))
-            ->from($db->quoteName('#__finder_taxonomy'))
-            ->where($db->quoteName('parent_id') . ' = 1')
-            ->where($db->quoteName('state') . ' = 1')
-            ->where($db->quoteName('access') . ' IN (' . $groups . ')');
+            // Set user variables
+            $groups = implode(',', Factory::getUser()->getAuthorisedViewLevels());
 
-        // Get the branch titles.
-        $db->setQuery($query);
+            // Create a query to get the taxonomy branch titles.
+            $query = $db->getQuery(true)
+                ->select($db->quoteName('title'))
+                ->from($db->quoteName('#__finder_taxonomy'))
+                ->where($db->quoteName('parent_id') . ' = 1')
+                ->where($db->quoteName('state') . ' = 1')
+                ->where($db->quoteName('access') . ' IN (' . $groups . ')');
+
+            // Get the branch titles.
+            $db->setQuery($query);
+
+            $titles = $db->loadColumn();
+        }
 
-        return $db->loadColumn();
+        return $titles;
     }
 
     /**

administrator/language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.4.0</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/language/en-GB/langmetadata.xml

@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>5.4.0</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/manifests/files/joomla.xml

@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.4.0-alpha4-dev</version>
-	<creationDate>2025-07</creationDate>
+	<version>5.4.0-beta2-dev</version>
+	<creationDate>2025-08</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

administrator/manifests/packages/pkg_en-GB.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>5.4.0.1</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/modules/mod_latest/services/provider.php

@@ -19,7 +19,7 @@
 /**
  * The latest articles module service provider.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.4.0
      */
     public function register(Container $container)
     {

administrator/modules/mod_latest/src/Dispatcher/Dispatcher.php

@@ -24,7 +24,7 @@
 /**
  * Dispatcher class for mod_latest
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {

administrator/modules/mod_latest/src/Helper/LatestHelper.php

@@ -37,7 +37,7 @@ class LatestHelper
      *
      * @return  mixed  An array of articles, or false on error.
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.4.0
      */
     public function getArticles(Registry $params, ArticlesModel $model, CMSApplicationInterface $app): mixed
     {
@@ -115,7 +115,7 @@ public function getArticles(Registry $params, ArticlesModel $model, CMSApplicati
      *
      * @return  string  The alternate title for the module.
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.4.0
      */
     public function getModuleTitle(Registry $params, CMSApplicationInterface $app): string
     {
@@ -148,7 +148,7 @@ public function getModuleTitle(Registry $params, CMSApplicationInterface $app):
      *
      * @return  mixed  An array of articles, or false on error.
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     * @deprecated 5.4.0 will be removed in 7.0
      *             Use the non-static method getArticles
      *             Example: Factory::getApplication()->bootModule('mod_latest', 'administrator')
      *                          ->getHelper('LatestHelper')
@@ -166,7 +166,7 @@ public static function getList(Registry $params, ArticlesModel $model)
      *
      * @return  string  The alternate title for the module.
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 7.0
+     * @deprecated 5.4.0 will be removed in 7.0
      *             Use the non-static method getModuleTitle
      *             Example: Factory::getApplication()->bootModule('mod_latest', 'administrator')
      *                          ->getHelper('LatestHelper')