[6.0] Upmerge 2025-08-28 (#46001)

richard67 · web-flow · commit 034de4a53439 · 2025-08-28T13:40:24.000+01:00
* [5.3] Translation Update (#45983) * Fix copy / paste error (#45979) * [5.3] Security updates for composer and npm dependencies for the upcoming 5.3.4 release (#45984) * composer update enshrined/svg-sanitize to 0.22.0 * npm fix audit issues * [5.3] Update TinyMCE from 6.8.5 to 6.8.6 to fix TinyMCE issue with cursor placement (#45987) * npm update tinymce from 6.8.5 to 6.8.6 * Update version in tinymce.xml * [5.4] Revert b/c breaking change in AbstractView::get (#45940) * Revert "[5.4] Replace deprecation AbstractView::get() in layouts (#45702)" * This reverts commit f1906ba. * [5.3] Update joomla/filesystem to fix extension uploads when post_max_size is 0 (#45986) * [5.4] Upmerge 2025-08-28 (#45997) * [5.3] Translation Update #45983 * [5.3] Fix copy / paste error in form fields #45979 * [5.3] Security updates for composer and npm dependencies for the upcoming 5.3.4 release #45984 * [5.3] Update joomla/filesystem to fix extension uploads when post_max_size is 0 #45986 * [5.4] Composer update joomla/filesystem to 3.2.0 (#45999) * Update content-hash
diff --git a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
@@ -26,7 +26,7 @@
 
 $saveHistory = ComponentHelper::getParams($component)->get('save_history', 0);
 
-$fields = $displayData->fields ?? [
+$fields = $displayData->get('fields') ?: [
     ['parent', 'parent_id'],
     ['published', 'state', 'enabled'],
     ['category', 'catid'],
@@ -39,7 +39,7 @@
     'version_note',
 ];
 
-$hiddenFields = $displayData->hidden_fields ?? [];
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
 
 if (!$saveHistory) {
     $hiddenFields[] = 'version_note';
diff --git a/components/com_contact/src/View/Categories/HtmlView.php b/components/com_contact/src/View/Categories/HtmlView.php
@@ -35,5 +35,5 @@ class HtmlView extends CategoriesView
      * @var    string  The name of the extension for the category
      * @since  3.2
      */
-    public $extension = 'com_contact';
+    protected $extension = 'com_contact';
 }
diff --git a/components/com_content/src/View/Categories/HtmlView.php b/components/com_content/src/View/Categories/HtmlView.php
@@ -35,5 +35,5 @@ class HtmlView extends CategoriesView
      * @var    string  The name of the extension for the category
      * @since  3.2
      */
-    public $extension = 'com_content';
+    protected $extension = 'com_content';
 }
diff --git a/components/com_newsfeeds/src/View/Categories/HtmlView.php b/components/com_newsfeeds/src/View/Categories/HtmlView.php
@@ -35,5 +35,5 @@ class HtmlView extends CategoriesView
      * @var    string  The name of the extension for the category
      * @since  3.2
      */
-    public $extension = 'com_newsfeeds';
+    protected $extension = 'com_newsfeeds';
 }
diff --git a/composer.json b/composer.json
@@ -96,7 +96,7 @@
     "ext-dom": "*",
     "composer/ca-bundle": "^1.5.7",
     "dragonmantank/cron-expression": "^3.4.0",
-    "enshrined/svg-sanitize": "^0.21.0",
+    "enshrined/svg-sanitize": "^0.22.0",
     "lcobucci/jwt": "^4.3.0",
     "web-token/jwt-library": "^3.4.8",
     "phpseclib/bcmath_compat": "^2.0.3",
diff --git a/composer.lock b/composer.lock
diff --git a/installation/language/tr-TR/joomla.ini b/installation/language/tr-TR/joomla.ini
@@ -84,6 +84,7 @@ INSTL_DATABASE_NO_SCHEMA="Bu veritabanı türü için veritabanı şeması yok."
 INSTL_DATABASE_PASSWORD_DESC="Oluşturduğunuz veritabanı şifresini veya sunucunuzun sağladığı şifreyi girin."
 INSTL_DATABASE_PREFIX_DESC="Bir tablo öneki girin veya rastgele oluşturulmuş olanı kullanın."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Aynı öneke sahip tablolara sahip mevcut bir veritabanı kullanıyorsanız, Joomla bu mevcut tabloları \"bak_\" önekini ekleyerek yeniden adlandıracaktır."
+INSTL_DATABASE_PREFIX_MSG="Tablo öneki bir harfle başlamalı, isteğe bağlı olarak alfanümerik karakterlerle izlenmeli ve alt çizgiyle bitmelidir."
 INSTL_DATABASE_RESPONSE_ERROR="Yükleme işlemi başarısız oldu."
 INSTL_DATABASE_TYPE_DESC="Veritabanı türünü seçin."
 INSTL_DATABASE_USER_DESC="Oluşturduğunuz veritabanı kullanıcı adını veya barındırıcınız tarafından sağlanan kullanıcı adını girin."
diff --git a/layouts/joomla/content/categories_default.php b/layouts/joomla/content/categories_default.php
@@ -23,7 +23,7 @@
     <?php // If there is a description in the menu parameters use that; ?>
     <?php if ($displayData->params->get('categories_description')) : ?>
         <div class="category-desc base-desc">
-            <?php echo HTMLHelper::_('content.prepare', $displayData->params->get('categories_description'), '', $displayData->extension . '.categories'); ?>
+            <?php echo HTMLHelper::_('content.prepare', $displayData->params->get('categories_description'), '', $displayData->get('extension') . '.categories'); ?>
         </div>
     <?php else : ?>
         <?php // Otherwise get one from the database if it exists. ?>
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
@@ -20,7 +20,7 @@
  * layout you need to close this div either by overriding this file or in your main layout.
  */
 $params    = $displayData->params;
-$category  = $displayData->category;
+$category  = $displayData->get('category');
 $extension = $category->extension;
 $canEdit   = $params->get('access-edit');
 $className = substr($extension, 4);
@@ -89,7 +89,7 @@
     <?php endif; ?>
     <?php echo $displayData->loadTemplate($displayData->subtemplatename); ?>
 
-    <?php if ($displayData->maxLevel != 0 && $displayData->children) : ?>
+    <?php if ($displayData->maxLevel != 0 && $displayData->get('children')) : ?>
         <div class="cat-children">
             <?php if ($params->get('show_category_heading_title_text', 1) == 1) : ?>
                 <h3>
diff --git a/layouts/joomla/edit/admin_modules.php b/layouts/joomla/edit/admin_modules.php
@@ -17,7 +17,7 @@
 $form   = $displayData->getForm();
 $input  = $app->getInput();
 
-$fields = $displayData->fields ?? [
+$fields = $displayData->get('fields') ?: [
     ['parent', 'parent_id'],
     ['published', 'state', 'enabled'],
     ['category', 'catid'],
@@ -30,7 +30,7 @@
     'version_note',
 ];
 
-$hiddenFields = $displayData->hidden_fields ?? [];
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
 
 if (!ModuleHelper::isAdminMultilang()) {
     $hiddenFields[] = 'language';
diff --git a/layouts/joomla/edit/fieldset.php b/layouts/joomla/edit/fieldset.php
@@ -15,17 +15,17 @@
 $app  = Factory::getApplication();
 $form = $displayData->getForm();
 
-$name = $displayData->fieldset;
+$name = $displayData->get('fieldset');
 $fieldSet = $form->getFieldset($name);
 
 if (empty($fieldSet)) {
     return;
 }
 
-$ignoreFields = $displayData->ignore_fields ?? [];
-$extraFields  = $displayData->extra_fields ?? [];
+$ignoreFields = $displayData->get('ignore_fields') ? : [];
+$extraFields  = $displayData->get('extra_fields') ? : [];
 
-if (!empty($displayData->showOptions) || ($displayData->show_options ?? 1)) {
+if (!empty($displayData->showOptions) || $displayData->get('show_options', 1)) {
     if (isset($extraFields[$name])) {
         foreach ($extraFields[$name] as $f) {
             if (in_array($f, $ignoreFields)) {
diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php
@@ -28,7 +28,7 @@
 
 $saveHistory = ComponentHelper::getParams($component)->get('save_history', 0);
 
-$fields = $displayData->fields ?? [
+$fields = $displayData->get('fields') ?: [
     'transition',
     ['parent', 'parent_id'],
     ['published', 'state', 'enabled'],
@@ -42,7 +42,7 @@
     'version_note',
 ];
 
-$hiddenFields = $displayData->hidden_fields ?? [];
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
 
 if (!$saveHistory) {
     $hiddenFields[] = 'version_note';
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
@@ -18,27 +18,27 @@
 $app       = Factory::getApplication();
 $form      = $displayData->getForm();
 $fieldSets = $form->getFieldsets();
-$helper    = ($displayData->useCoreUI ?? false) ? 'uitab' : 'bootstrap';
+$helper    = $displayData->get('useCoreUI', false) ? 'uitab' : 'bootstrap';
 
 if (empty($fieldSets)) {
     return;
 }
 
-$ignoreFieldsets      = $displayData->ignore_fieldsets ?? [];
-$outputFieldsets      = $displayData->output_fieldsets ?? [];
-$ignoreFieldsetFields = $displayData->ignore_fieldset_fields ?? [];
-$ignoreFields         = $displayData->ignore_fields ?? [];
-$extraFields          = $displayData->extra_fields ?? [];
-$tabName              = $displayData->tab_name ?? 'myTab';
+$ignoreFieldsets      = $displayData->get('ignore_fieldsets') ?: [];
+$outputFieldsets      = $displayData->get('output_fieldsets') ?: [];
+$ignoreFieldsetFields = $displayData->get('ignore_fieldset_fields') ?: [];
+$ignoreFields         = $displayData->get('ignore_fields') ?: [];
+$extraFields          = $displayData->get('extra_fields') ?: [];
+$tabName              = $displayData->get('tab_name') ?: 'myTab';
 
 // These are required to preserve data on save when fields are not displayed.
-$hiddenFieldsets = $displayData->hiddenFieldsets ?? [];
+$hiddenFieldsets = $displayData->get('hiddenFieldsets') ?: [];
 
 // These are required to configure showing and hiding fields in the editor.
-$configFieldsets = $displayData->configFieldsets ?? [];
+$configFieldsets = $displayData->get('configFieldsets') ?: [];
 
 // Handle the hidden fieldsets when show_options is set false
-if (!($displayData->show_options ?? 1)) {
+if (!$displayData->get('show_options', 1)) {
     // The HTML buffer
     $html   = [];
 
diff --git a/layouts/joomla/edit/publishingdata.php b/layouts/joomla/edit/publishingdata.php
@@ -12,7 +12,7 @@
 
 $form = $displayData->getForm();
 
-$fields = $displayData->fields ?? [
+$fields = $displayData->get('fields') ?: [
     'publish_up',
     'publish_down',
     'featured_up',
@@ -27,7 +27,7 @@
     'id'
 ];
 
-$hiddenFields = $displayData->hidden_fields ?? [];
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
 
 foreach ($fields as $field) {
     foreach ((array) $field as $f) {
diff --git a/libraries/src/Form/Field/AuthorField.php b/libraries/src/Form/Field/AuthorField.php
@@ -29,7 +29,7 @@ class AuthorField extends ListField
     public $type = 'Author';
 
     /**
-     * Cached array of the category items.
+     * Cached array of the user items.
      *
      * @var    array[]
      * @since  3.2
diff --git a/libraries/src/Form/Field/LimitboxField.php b/libraries/src/Form/Field/LimitboxField.php
@@ -31,7 +31,7 @@ class LimitboxField extends ListField
     public $type = 'Limitbox';
 
     /**
-     * Cached array of the category items.
+     * Cached array of the list limits.
      *
      * @var    array[]
      * @since  3.2
diff --git a/libraries/src/Form/Field/PredefinedlistField.php b/libraries/src/Form/Field/PredefinedlistField.php
@@ -31,7 +31,7 @@ abstract class PredefinedlistField extends ListField
     protected $type = 'Predefinedlist';
 
     /**
-     * Cached array of the category items.
+     * Cached array of the predefined items.
      *
      * @var    array[]
      * @since  3.2
diff --git a/libraries/src/Form/Field/UsergrouplistField.php b/libraries/src/Form/Field/UsergrouplistField.php
@@ -32,7 +32,7 @@ class UsergrouplistField extends ListField
     protected $type = 'UserGroupList';
 
     /**
-     * Cached array of the category items.
+     * Cached array of the user groups.
      *
      * @var    array[]
      * @since  3.2
diff --git a/libraries/src/MVC/View/CategoryView.php b/libraries/src/MVC/View/CategoryView.php
@@ -58,7 +58,7 @@ class CategoryView extends HtmlView
      * @var    CategoryNode
      * @since  3.2
      */
-    public $category;
+    protected $category;
 
     /**
      * The list of other categories for this extension.
@@ -82,7 +82,7 @@ class CategoryView extends HtmlView
      * @var    array
      * @since  3.2
      */
-    public $children;
+    protected $children;
 
     /**
      * The name of the extension for the category
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,5 @@ class HtmlView extends CategoriesView`
`35`	`35`	`* @var string The name of the extension for the category`
`36`	`36`	`* @since 3.2`
`37`	`37`	`*/`
`38`		`- public $extension = 'com_contact';`
	`38`	`+ protected $extension = 'com_contact';`
`39`	`39`	`}`