Merge pull request #44631 from softforge/upmerges/2024-12-18

[6.0] Upmerges - 2024-12-8

Author: softforge

administrator/components/com_actionlogs/src/Model/ActionlogModel.php

@@ -55,7 +55,13 @@ public function addLog($messages, $messageLanguageKey, $context, $userId = 0)
             @trigger_error(\sprintf('User ID must be an integer in %s.', __METHOD__), E_USER_DEPRECATED);
         }
 
-        $user   = $userId ? $this->getUserFactory()->loadUserById($userId) : $this->getCurrentUser();
+        try {
+            $user = $userId ? $this->getUserFactory()->loadUserById($userId) : $this->getCurrentUser();
+        } catch (\UnexpectedValueException $e) {
+            @trigger_error(\sprintf('UserFactory must be set, this will not be caught anymore in 7.0.'), E_USER_DEPRECATED);
+            $user = Factory::getUser($userId);
+        }
+
         $db     = $this->getDatabase();
         $date   = Factory::getDate();
         $params = ComponentHelper::getComponent('com_actionlogs')->getParams();

administrator/components/com_banners/src/Model/BannerModel.php

@@ -347,6 +347,7 @@ protected function prepareTable($table)
             // Set the values
             $table->created    = $date->toSql();
             $table->created_by = $user->id;
+            $table->version    = 1;
 
             // Set ordering to the last item if not set
             if (empty($table->ordering)) {
@@ -364,10 +365,8 @@ protected function prepareTable($table)
             // Set the values
             $table->modified    = $date->toSql();
             $table->modified_by = $user->id;
+            $table->version++;
         }
-
-        // Increment the content version number.
-        $table->version++;
     }
 
     /**

administrator/components/com_contact/src/Model/ContactModel.php

@@ -363,6 +363,7 @@ protected function prepareTable($table)
         if (empty($table->id)) {
             // Set the values
             $table->created = $date;
+            $table->version = 1;
 
             // Set ordering to the last item if not set
             if (empty($table->ordering)) {
@@ -379,10 +380,8 @@ protected function prepareTable($table)
             // Set the values
             $table->modified    = $date;
             $table->modified_by = $this->getCurrentUser()->id;
+            $table->version++;
         }
-
-        // Increment the content version number.
-        $table->version++;
     }
 
     /**

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

@@ -347,7 +347,7 @@ protected function prepareTable($table)
         }
 
         // Increment the content version number.
-        $table->version++;
+        $table->version = empty($table->version) ? 1 : $table->version + 1;
 
         // Reorder the articles within the category so the new article is first
         if (empty($table->id)) {

administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php

@@ -305,6 +305,7 @@ protected function prepareTable($table)
         if (empty($table->id)) {
             // Set the values
             $table->created = $date->toSql();
+            $table->version = 1;
 
             // Set ordering to the last item if not set
             if (empty($table->ordering)) {
@@ -321,10 +322,8 @@ protected function prepareTable($table)
             // Set the values
             $table->modified    = $date->toSql();
             $table->modified_by = $user->id;
+            $table->version++;
         }
-
-        // Increment the content version number.
-        $table->version++;
     }
 
     /**

administrator/components/com_plugins/src/Model/PluginsModel.php

@@ -135,7 +135,7 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
                 $escapedSearchString = $this->refineSearchStringToRegex($search, '/');
 
                 foreach ($result as $i => $item) {
-                    if (!preg_match("/$escapedSearchString/i", $item->name)) {
+                    if (!preg_match("/$escapedSearchString/iu", $item->name)) {
                         unset($result[$i]);
                     }
                 }

administrator/components/com_tags/src/Model/TagModel.php

@@ -325,7 +325,7 @@ public function save($data)
     protected function prepareTable($table)
     {
         // Increment the content version number.
-        $table->version++;
+        $table->version = empty($table->version) ? 1 : $table->version + 1;
     }
 
     /**

build/build.php

@@ -272,7 +272,6 @@ function clean_composer(string $dir)
     $composerOptions .= '--no-dev';
 }
 
-
 echo "Start build for remote $remote.\n";
 echo "Delete old release folder.\n";
 system('rm -rf ' . $tmp);

components/com_tags/src/Service/Router.php

@@ -308,7 +308,15 @@ public function parse(&$segments)
 
         while (\count($segments)) {
             $id    = array_shift($segments);
-            $ids[] = $this->fixSegment($id);
+            $slug  = $this->fixSegment($id);
+
+            // We did not find the segment as a tag in the DB
+            if ($slug === $id) {
+                array_unshift($segments, $id);
+                break;
+            }
+
+            $ids[] = $slug;
         }
 
         if (\count($ids)) {

components/com_users/src/View/Registration/HtmlView.php

@@ -65,7 +65,7 @@ class HtmlView extends BaseHtmlView
     public $document;
 
     /**
-     * Should we show a captcha form for the submission of the article?
+     * Should we show a captcha form for the registration of a user?
      *
      * @var    boolean
      *