Merge branch '6.0-dev' into toolbar

Author: softforge

.github/CONTRIBUTING.md

@@ -20,8 +20,10 @@ Please be patient as not all items will be viewed or tested immediately (remembe
 Bug fixing PRs should be made to the `5.4-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `6.1-dev`.
 
 
-| Branch  | Purpose                                                                                 |
-|---------|-----------------------------------------------------------------------------------------|
-| 5.4-dev | Branch for the current 5.x Joomla version.                                              |
-| 6.0-dev | Branch for the current 6.x Joomla version. Bugfixes only for 6.x go into this branch.   |
-| 6.1-dev | Branch for the next minor 6.x Joomla version. New features have to go into this branch. |
+| Branch  | Purpose                                                                                                      |
+|---------|--------------------------------------------------------------------------------------------------------------|
+| 5.4-dev | Branch for the current 5.x Joomla version.                                                                   |
+| 6.0-dev | Branch for the current 6.x Joomla version. Bugfixes only for 6.0 go into this branch.                        |
+| 6.1-dev | Branch for the next minor 6.x Joomla version. Bugfixes only for 6.1 go into this branch.                     |
+| 6.2-dev | Branch for the next minor 6.x Joomla version. New features have to go into this branch.                      |
+| 7.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |

.github/workflows/merge-conflicts.yml

@@ -2,7 +2,7 @@ name: "Detect merge conflicts"
 on:
   # So that PRs touching the same files as the push are updated
   push:
-  # So that the `dirtyLabel` is removed if conflicts are resolve
+  # So that the `dirtyLabel` is removed if conflicts are resolved
   # We recommend `pull_request_target` so that github secrets are available.
   # In `pull_request` we wouldn't be able to change labels of fork PRs
   pull_request_target:

administrator/components/com_scheduler/src/Model/TaskModel.php

@@ -418,11 +418,17 @@ public function getTask(array $options = []): ?\stdClass
      */
     private function hasRunningTasks($db): bool
     {
+        $now       = Factory::getDate('now', 'UTC');
+        $timeout   = ComponentHelper::getParams('com_scheduler')->get('timeout', 300);
+        $threshold = (clone $now)->modify("-$timeout seconds")->toSql();
+
         $lockCountQuery = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName(self::TASK_TABLE))
             ->where($db->quoteName('locked') . ' IS NOT NULL')
-            ->where($db->quoteName('state') . ' = 1');
+            ->where($db->quoteName('locked') . ' > :threshold')
+            ->where($db->quoteName('state') . ' = 1')
+            ->bind(':threshold', $threshold);
 
         try {
             $runningCount = $db->setQuery($lockCountQuery)->loadResult();

administrator/components/com_scheduler/src/Model/TasksModel.php

@@ -484,14 +484,23 @@ public function hasDueTasks(Date $time): bool
         $db  = $this->getDatabase();
         $now = $time->toSql();
 
+        $timeout   = ComponentHelper::getParams('com_scheduler')->get('timeout', 300);
+        $threshold = (clone $time)->modify("-$timeout seconds")->toSql();
+
         $query = $db->createQuery()
             // Count due tasks
             ->select('SUM(CASE WHEN ' . $db->quoteName('a.next_execution') . ' <= :now THEN 1 ELSE 0 END) AS due_count')
             // Count locked tasks
-            ->select('SUM(CASE WHEN ' . $db->quoteName('a.locked') . ' IS NULL THEN 0 ELSE 1 END) AS locked_count')
+            ->select(
+                'SUM(CASE WHEN ' .
+                $db->quoteName('a.locked') . ' IS NOT NULL AND ' .
+                $db->quoteName('a.locked') . ' > :threshold ' .
+                'THEN 1 ELSE 0 END) AS locked_count'
+            )
             ->from($db->quoteName('#__scheduler_tasks', 'a'))
             ->where($db->quoteName('a.state') . ' = 1')
-            ->bind(':now', $now);
+            ->bind(':now', $now)
+            ->bind(':threshold', $threshold);
 
         $db->setQuery($query);
 

build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss

@@ -85,7 +85,7 @@
   background-color: var(--body-bg);
 
   .choices__item {
-    padding-inline-end: 10px;
+    padding-inline-end: 25px;
   }
 
   .choices__item--selectable {

libraries/src/HTML/HTMLHelper.php

@@ -211,7 +211,7 @@ final public static function _(string $key, ...$methodArgs)
     public static function register($key, callable $function)
     {
         @trigger_error(
-            'Support for registering functions is deprecated and will be removed in Joomla 6.0, use the service registry instead',
+            'Support for registering functions is deprecated and will be removed in Joomla 7.0, use the service registry instead',
             E_USER_DEPRECATED
         );
 
@@ -236,7 +236,7 @@ public static function register($key, callable $function)
     public static function unregister($key)
     {
         @trigger_error(
-            'Support for registering functions is deprecated and will be removed in Joomla 6.0, use the service registry instead',
+            'Support for registering functions is deprecated and will be removed in Joomla 7.0, use the service registry instead',
             E_USER_DEPRECATED
         );
 

modules/mod_articles/tmpl/default_items.php

@@ -108,7 +108,7 @@
 
                         <?php echo $item->event->afterDisplayContent; ?>
 
-                        <?php if ($params->get('show_readmore')) : ?>
+                        <?php if ($params->get('show_readmore') && !empty($item->fulltext)) : ?>
                             <?php if ($params->get('show_readmore_title', '') !== '') : ?>
                                 <?php $item->params->set('show_readmore_title', $params->get('show_readmore_title')); ?>
                                 <?php $item->params->set('readmore_limit', $params->get('readmore_limit')); ?>

modules/mod_tags_popular/src/Helper/TagsPopularHelper.php

@@ -55,7 +55,7 @@ public function getTags(&$params)
             ->select(
                 [
                     'MAX(' . $db->quoteName('tag_id') . ') AS ' . $db->quoteName('tag_id'),
-                    'COUNT(*) AS ' . $db->quoteName('count'),
+                    'COUNT(DISTINCT ' . $db->quoteName('m.core_content_id') . ') AS ' . $db->quoteName('count'),
                     'MAX(' . $db->quoteName('t.title') . ') AS ' . $db->quoteName('title'),
                     'MAX(' . $db->quoteName('t.access') . ') AS ' . $db->quoteName('access'),
                     'MAX(' . $db->quoteName('t.alias') . ') AS ' . $db->quoteName('alias'),