Merge remote-tracking branch 'upstream/5.3-dev' into upmerges/2024-12-04

Author: Bodge-IT

.drone.yml

@@ -384,6 +384,8 @@ steps:
       - git rev-parse origin/$MINORVERSION-dev > transfer/$MINORVERSION.txt
       - php build/build.php --remote=origin/$MINORVERSION-dev --exclude-gzip --disable-patch-packages
       - mv build/tmp/packages/* transfer/
+      - php build/build.php --remote=origin/$MINORVERSION-dev --exclude-zip --exclude-bzip2 --debug-build
+      - mv build/tmp/packages/* transfer/
 
   - name: upload
     image: joomlaprojects/docker-images:packager
@@ -431,6 +433,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 8587cef2227502ec33fa0434dadf0a3178d6fa7cbbfbe4e962b3c8784c3a2c6f
+hmac: 8cfd796801cb7d0484c3b022f17dc6663109432397f6997650aeb0976c36a788
 
 ...

administrator/components/com_actionlogs/actionlogs.xml

@@ -16,7 +16,6 @@
 			<file>actionlogs.xml</file>
 			<file>config.xml</file>
 			<folder>forms</folder>
-			<folder>layouts</folder>
 			<folder>services</folder>
 			<folder>src</folder>
 			<folder>tmpl</folder>

administrator/components/com_actionlogs/forms/filter_actionlogs.xml

@@ -27,7 +27,7 @@
 		</field>
 		<field
 			name="user"
-			type="logcreator"
+			type="user"
 			label="COM_ACTIONLOGS_NAME"
 			class="js-select-submit-on-change"
 			>

administrator/components/com_actionlogs/src/Field/LogcreatorField.php

@@ -20,6 +20,10 @@
  * Field to load a list of all users that have logged actions
  *
  * @since  3.9.0
+ *
+ * No longer used, will be removed without replacement
+ *
+ * @deprecated  7.0  will be removed in 7.0
  */
 class LogcreatorField extends ListField
 {

administrator/components/com_admin/admin.xml

@@ -15,7 +15,6 @@
 		<files folder="admin">
 			<filename>admin.xml</filename>
 			<filename>script.php</filename>
-			<folder>forms</folder>
 			<folder>postinstall</folder>
 			<folder>services</folder>
 			<folder>src</folder>

administrator/components/com_banners/banners.xml

@@ -23,9 +23,6 @@
 	<files folder="site">
 		<folder>src</folder>
 	</files>
-	<languages folder="site">
-		<language tag="en-GB">language/en-GB/com_banners.ini</language>
-	</languages>
 	<media destination="com_banners" folder="media">
 		<folder>js</folder>
 	</media>

administrator/components/com_content/forms/filter_articles.xml

@@ -126,6 +126,8 @@
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
 			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="ws.title ASC" requires="workflow">JSTAGE_ASC</option>
+			<option value="ws.title DESC" requires="workflow">JSTAGE_DESC</option>
 			<option value="a.featured ASC">JFEATURED_ASC</option>
 			<option value="a.featured DESC">JFEATURED_DESC</option>
 			<option value="a.state ASC">JSTATUS_ASC</option>

administrator/components/com_content/forms/filter_featured.xml

@@ -111,6 +111,8 @@
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="fp.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
 			<option value="fp.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="ws.title ASC" requires="workflow">JSTAGE_ASC</option>
+			<option value="ws.title DESC" requires="workflow">JSTAGE_DESC</option>
 			<option value="a.state ASC">JSTATUS_ASC</option>
 			<option value="a.state DESC">JSTATUS_DESC</option>
 			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>

administrator/components/com_content/src/Model/ArticlesModel.php

@@ -104,11 +104,6 @@ public function getFilterForm($data = [], $loadData = true)
 
         if (!$params->get('workflow_enabled')) {
             $form->removeField('stage', 'filter');
-        } else {
-            $ordering = $form->getField('fullordering', 'list');
-
-            $ordering->addOption('JSTAGE_ASC', ['value' => 'ws.title ASC']);
-            $ordering->addOption('JSTAGE_DESC', ['value' => 'ws.title DESC']);
         }
 
         return $form;

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

@@ -711,13 +711,6 @@ public function optimize()
         // Get the database object.
         $db         = $this->db;
         $serverType = strtolower($db->getServerType());
-        $query      = $db->getQuery(true);
-
-        // Delete all orphaned terms.
-        $query->delete($db->quoteName('#__finder_terms'))
-            ->where($db->quoteName('links') . ' <= 0');
-        $db->setQuery($query);
-        $db->execute();
 
         // Delete all broken links. (Links missing the object)
         $query = $db->getQuery(true)
@@ -736,6 +729,25 @@ public function optimize()
         $db->setQuery($query);
         $db->execute();
 
+        // Update count of links in terms table
+        $query  = $db->getQuery(true);
+        $query2 = $db->getQuery(true);
+        $query2->select('COUNT(lt.link_id)')
+            ->from($db->quoteName('#__finder_links_terms', 'lt'))
+            ->where($db->quoteName('lt.term_id') . ' = ' . $db->quoteName('t.term_id'));
+        $query->update($db->quoteName('#__finder_terms', 't'))
+            ->set($db->quoteName('t.links') . ' = (' . $query2 . ')');
+        $db->setQuery($query);
+        $db->execute();
+
+        // Delete all orphaned terms.
+        $query = $db->getQuery(true);
+        $query->delete($db->quoteName('#__finder_terms'))
+            ->where($db->quoteName('links') . ' <= 0');
+        $db->setQuery($query);
+        $db->execute();
+
+
         // Delete all orphaned terms
         $query2 = $db->getQuery(true)
             ->select($db->quoteName('term_id'))