Merge remote-tracking branch 'upstream/5.3-dev' into 5.4-upmerge-2025-05-13

Author: muhme

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

@@ -163,7 +163,8 @@ protected function sendNotificationEmails($messages, $username, $context)
             $m              = [];
             $m['extension'] = Text::_($extension);
             $m['message']   = ActionlogsHelper::getHumanReadableLogMessage($message);
-            $m['date']      = HTMLHelper::_('date', $message->log_date, 'Y-m-d H:i:s T', 'UTC');
+            $tzOffset       = Factory::getApplication()->get('offset');
+            $m['date']      = HTMLHelper::_('date', $message->log_date, 'Y-m-d H:i:s T', $tzOffset);
             $m['username']  = $username;
             $temp[]         = $m;
 

administrator/components/com_admin/sql/updates/postgresql/5.2.3-2025-01-09.sql

@@ -1,3 +1,3 @@
 UPDATE "#__mail_templates"
-SET "params" = '"tags":["messages","message","date","extension","username"]}'
+SET "params" = '{"tags":["messages","message","date","extension","username"]}'
 WHERE "template_id" = 'com_actionlogs.notification';

administrator/components/com_admin/sql/updates/postgresql/5.3.1-2025-04-27.sql

@@ -0,0 +1,4 @@
+UPDATE "#__mail_templates"
+SET "params" = '{"tags":["messages","message","date","extension","username"]}'
+WHERE "template_id" = 'com_actionlogs.notification'
+AND "params" = '"tags":["messages","message","date","extension","username"]}';

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

@@ -762,6 +762,12 @@ public function save($data)
             } elseif ($data['alias'] == $origTable->alias) {
                 $data['alias'] = '';
             }
+
+            if (!$this->workflowEnabled) {
+                $data['state'] = 0;
+            } else {
+                $data['transition'] = '';
+            }
         }
 
         // Automatic handling of alias for empty fields

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

@@ -71,9 +71,9 @@ public function parse($input)
         // Add a space before both the OPEN and CLOSE tags of BLOCK and LINE BREAKING elements,
         // e.g. 'all<h1><em>m</em>obile  List</h1>' will become 'all mobile  List'
         $input = preg_replace('/(<|<\/)(' .
-            'address|article|aside|blockquote|br|canvas|dd|div|dl|dt|' .
-            'fieldset|figcaption|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|li|' .
-            'main|nav|noscript|ol|output|p|pre|section|table|tfoot|ul|video' .
+            'address|article|aside|blockquote|br|canvas|cite|code|data|details|dd|div|dl|dt|' .
+            'fieldset|figcaption|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|li|label|' .
+            'main|nav|noscript|ol|option|output|p|pre|section|table|td|tfoot|th|ul|video' .
             ')\b/i', ' $1$2', $input);
 
         // Strip HTML tags.

build/build-modules-js/stylesheets/handle-scss.mjs

@@ -4,28 +4,21 @@ import { dirname, sep } from 'node:path';
 import rtlcss from 'rtlcss';
 import { ensureDir } from 'fs-extra';
 import { transform as transformCss, Features } from 'lightningcss';
-import * as Sass from 'sass-embedded';
+import { compileAsync } from 'sass-embedded';
+
+const getOutputFile = (file) => file.replace(`${sep}scss${sep}`, `${sep}css${sep}`).replace('.scss', '.css').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
 
 export const handleScssFile = async (file) => {
-  const cssFile = file
-    .replace(`${sep}scss${sep}`, `${sep}css${sep}`)
-    .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`)
-    .replace('.scss', '.css');
+  let contents;
+  const cssFile = getOutputFile(file);
 
-  let compiled;
   try {
-    compiled = Sass.compile(file);
+    const { css } = await compileAsync(file);
+    contents = css.toString();
   } catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(error.formatted);
-    process.exitCode = 1;
+    throw new Error(error.formatted);
   }
 
-  let contents = transformCss({
-    code: Buffer.from(compiled.css.toString()),
-    minify: false,
-  }).code;
-
   if (cssFile.endsWith('-rtl.css')) {
     contents = rtlcss.process(contents);
   }
@@ -39,15 +32,15 @@ ${contents}`,
     { encoding: 'utf8', mode: 0o644 },
   );
 
-  const cssMin = transformCss({
+  const { code: cssMin } = transformCss({
     code: Buffer.from(contents),
     minify: true,
     exclude: Features.VendorPrefixes,
   });
 
   // Ensure the folder exists or create it
   await ensureDir(dirname(cssFile.replace('.css', '.min.css')), {});
-  await writeFile(cssFile.replace('.css', '.min.css'), `@charset "UTF-8";${cssMin.code}`, { encoding: 'utf8', mode: 0o644 });
+  await writeFile(cssFile.replace('.css', '.min.css'), `@charset "UTF-8";${cssMin}`, { encoding: 'utf8', mode: 0o644 });
 
   // eslint-disable-next-line no-console
   console.log(`✅ SCSS File compiled: ${cssFile}`);

build/build-modules-js/stylesheets/scss-transform.mjs

@@ -54,7 +54,7 @@ public static function logSearch(Query $searchquery, $resultCount = 0)
         $temp              = new \stdClass();
         $temp->input       = trim(strtolower((string) $searchquery->input));
         $entry             = new \stdClass();
-        $entry->searchterm = $temp->input;
+        $entry->searchterm = mb_substr(trim($temp->input), 0, 255);
         $entry->query      = serialize($temp);
         $entry->md5sum     = md5($entry->query);
         $entry->hits       = 1;

components/com_finder/src/Helper/FinderHelper.php

@@ -1,91 +1,2 @@
+// This file is a placeholder for the rtl template. That means it is required and should not be deleted.
 @import "template";
-
-body {
-  direction: rtl;
-}
-
-// Javascript Warning
-#javascript-warning {
-  font-size: 16px;
-  text-align: center;
-}
-
-textarea {
-  resize: both;
-}
-
-textarea.vert {
-  resize: vertical;
-}
-
-textarea.noResize {
-  resize: none;
-}
-
-.j-install-step {
-  select {
-    width: 100%;
-    margin-right: 0 !important;
-  }
-}
-
-.j-install-step-header {
-  span {
-    margin-right: auto;
-    margin-left: 5px;
-  }
-}
-
-.lang-select {
-  left: 0;
-}
-
-.control-group {
-  .control-label {
-    padding-top: 5px;
-    padding-right: 5px;
-    text-align: right;
-  }
-}
-
-.checkboxes {
-  .checkbox input {
-    margin-right: 0;
-  }
-}
-
-.form-group {
-  text-align: right;
-}
-
-.container-installation {
-  text-align: right;
-}
-
-.j-header-help {
-  margin: 20px auto 20px 20px;
-}
-
-.j-footer {
-  text-align: left;
-}
-
-.#{$jicon-css-prefix}-chevron-right::before,
-.#{$fa-css-prefix}-chevron-right::before {
-  content: "";
-}
-
-.j-install-last-step [class^="icon-"],
-.j-install-last-step [class*=" icon-"] {
-  display: inline;
-}
-
-#jform_db_prefix {
-  text-align: right;
-  direction: ltr;
-}
-
-// Language Table
-caption {
-  text-align: right;
-}