Skip to content

Commit d274d27

Browse files
softforgesoftforge
authored
[6.0] Upmerge 2025-09-23
Merge pull request joomla#46148 from richard67/6.0-dev-upmerge-2025-09-23
2 parents 2ee590d + 133fa2a commit d274d27

File tree

18 files changed

+98
-42
lines changed

18 files changed

+98
-42
lines changed

‎administrator/components/com_admin/src/Model/SysinfoModel.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,19 +313,19 @@ public function &getInfo(): array
313313
$db = $this->getDatabase();
314314

315315
$this->info = [
316+
'version' => (new Version())->getLongVersion(),
317+
'compatpluginenabled' => PluginHelper::isEnabled('behaviour', 'compat'),
318+
'compatpluginparameters' => $this->getCompatPluginParameters(),
319+
'phpversion' => PHP_VERSION,
316320
'php' => php_uname(),
317321
'dbserver' => $db->getServerType(),
318322
'dbversion' => $db->getVersion(),
319323
'dbcollation' => $db->getCollation(),
320324
'dbconnectioncollation' => $db->getConnectionCollation(),
321325
'dbconnectionencryption' => $db->getConnectionEncryption(),
322326
'dbconnencryptsupported' => $db->isConnectionEncryptionSupported(),
323-
'phpversion' => PHP_VERSION,
324327
'server' => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
325328
'sapi_name' => PHP_SAPI,
326-
'version' => (new Version())->getLongVersion(),
327-
'compatpluginenabled' => PluginHelper::isEnabled('behaviour', 'compat'),
328-
'compatpluginparameters' => $this->getCompatPluginParameters(),
329329
'useragent' => $_SERVER['HTTP_USER_AGENT'] ?? '',
330330
];
331331

‎administrator/components/com_admin/tmpl/sysinfo/default_system.php‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,98 +34,99 @@
3434
<tbody>
3535
<tr>
3636
<th scope="row">
37-
<?php echo Text::_('COM_ADMIN_PHP_BUILT_ON'); ?>
37+
<?php echo Text::_('COM_ADMIN_JOOMLA_VERSION'); ?>
3838
</th>
3939
<td>
40-
<?php echo $this->info['php']; ?>
40+
<?php echo $this->info['version']; ?>
4141
</td>
4242
</tr>
4343
<tr>
4444
<th scope="row">
45-
<?php echo Text::_('COM_ADMIN_DATABASE_TYPE'); ?>
45+
<?php echo Text::_('COM_ADMIN_JOOMLA_COMPAT_PLUGIN'); ?>
4646
</th>
4747
<td>
48-
<?php echo $this->info['dbserver']; ?>
48+
<?php echo $this->info['compatpluginenabled'] ? Text::_('JENABLED') . ' (' . $this->info['compatpluginparameters'] . ')' : Text::_('JDISABLED'); ?>
4949
</td>
5050
</tr>
5151
<tr>
5252
<th scope="row">
53-
<?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?>
53+
<?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
5454
</th>
5555
<td>
56-
<?php echo $this->info['dbversion']; ?>
56+
<?php echo $this->info['phpversion']; ?>
5757
</td>
5858
</tr>
5959
<tr>
6060
<th scope="row">
61-
<?php echo Text::_('COM_ADMIN_DATABASE_COLLATION'); ?>
61+
<?php echo Text::_('COM_ADMIN_PHP_BUILT_ON'); ?>
6262
</th>
6363
<td>
64-
<?php echo $this->info['dbcollation']; ?>
64+
<?php echo $this->info['php']; ?>
6565
</td>
6666
</tr>
6767
<tr>
6868
<th scope="row">
69-
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?>
69+
<?php echo Text::_('COM_ADMIN_DATABASE_TYPE'); ?>
7070
</th>
7171
<td>
72-
<?php echo $this->info['dbconnectioncollation']; ?>
72+
<?php echo $this->info['dbserver']; ?>
7373
</td>
7474
</tr>
7575
<tr>
7676
<th scope="row">
77-
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION'); ?>
77+
<?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?>
7878
</th>
7979
<td>
80-
<?php echo $this->info['dbconnectionencryption'] ?: Text::_('JNONE'); ?>
80+
<?php echo $this->info['dbversion']; ?>
8181
</td>
8282
</tr>
8383
<tr>
8484
<th scope="row">
85-
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED'); ?>
85+
<?php echo Text::_('COM_ADMIN_DATABASE_COLLATION'); ?>
8686
</th>
8787
<td>
88-
<?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
88+
<?php echo $this->info['dbcollation']; ?>
8989
</td>
9090
</tr>
9191
<tr>
9292
<th scope="row">
93-
<?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
93+
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?>
9494
</th>
9595
<td>
96-
<?php echo $this->info['phpversion']; ?>
96+
<?php echo $this->info['dbconnectioncollation']; ?>
9797
</td>
9898
</tr>
9999
<tr>
100100
<th scope="row">
101-
<?php echo Text::_('COM_ADMIN_WEB_SERVER'); ?>
101+
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION'); ?>
102102
</th>
103103
<td>
104-
<?php echo HTMLHelper::_('system.server', $this->info['server']); ?>
104+
<?php echo $this->info['dbconnectionencryption'] ?: Text::_('JNONE'); ?>
105105
</td>
106106
</tr>
107107
<tr>
108108
<th scope="row">
109-
<?php echo Text::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?>
109+
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED'); ?>
110110
</th>
111111
<td>
112-
<?php echo $this->info['sapi_name']; ?>
112+
<?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
113113
</td>
114114
</tr>
115+
115116
<tr>
116117
<th scope="row">
117-
<?php echo Text::_('COM_ADMIN_JOOMLA_VERSION'); ?>
118+
<?php echo Text::_('COM_ADMIN_WEB_SERVER'); ?>
118119
</th>
119120
<td>
120-
<?php echo $this->info['version']; ?>
121+
<?php echo HTMLHelper::_('system.server', $this->info['server']); ?>
121122
</td>
122123
</tr>
123124
<tr>
124125
<th scope="row">
125-
<?php echo Text::_('COM_ADMIN_JOOMLA_COMPAT_PLUGIN'); ?>
126+
<?php echo Text::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?>
126127
</th>
127128
<td>
128-
<?php echo $this->info['compatpluginenabled'] ? Text::_('JENABLED') . ' (' . $this->info['compatpluginparameters'] . ')' : Text::_('JDISABLED'); ?>
129+
<?php echo $this->info['sapi_name']; ?>
129130
</td>
130131
</tr>
131132
<tr>

‎administrator/components/com_menus/presets/alternate.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,13 @@
580580
scope="help"
581581
/>
582582

583+
<menuitem
584+
title="MOD_MENU_HELP_PROGRAMMERS"
585+
type="url"
586+
target="_blank"
587+
link="https://manual.joomla.org"
588+
/>
589+
583590
<menuitem
584591
type="separator"
585592
/>

‎administrator/components/com_menus/presets/help.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@
3131
link="https://docs.joomla.org"
3232
/>
3333

34+
<menuitem
35+
title="MOD_MENU_HELP_PROGRAMMERS"
36+
type="url"
37+
target="_blank"
38+
link="https://manual.joomla.org"
39+
/>
40+
3441
<menuitem
3542
title="MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM"
3643
type="url"

‎administrator/components/com_users/src/DataShape/CaptiveRenderOptions.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ class CaptiveRenderOptions extends DataShapeObject
7171
/**
7272
* Attributes other than type and id which will be added to the HTML input box.
7373
*
74-
* @var array
75-
* @@since 4.2.0
74+
* @var array
75+
* @since 4.2.0
7676
*/
7777
protected $input_attributes = [];
7878

@@ -185,10 +185,10 @@ protected function setField_type(string $value)
185185
/**
186186
* Setter for the input_attributes property.
187187
*
188-
* @param array $value The value to set
188+
* @param array $value The value to set
189189
*
190-
* @return void
191-
* @@since 4.2.0
190+
* @return void
191+
* @since 4.2.0
192192
*/
193193
// phpcs:ignore
194194
protected function setInput_attributes(array $value)

‎administrator/components/com_users/src/DataShape/SetupRenderOptions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ class SetupRenderOptions extends DataShapeObject
114114
/**
115115
* Attributes other than type and id which will be added to the HTML input box.
116116
*
117-
* @var array
118-
* @@since 4.2.0
117+
* @var array
118+
* @since 4.2.0
119119
*/
120120
protected $input_attributes = [];
121121

‎administrator/language/en-GB/mod_menu.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ MOD_MENU_HELP_PARENT_MEET_JOOMLERS="Meet Joomlers"
6969
MOD_MENU_HELP_PARENT_NEWS="News"
7070
MOD_MENU_HELP_PARENT_RESOURCES="Resources"
7171
MOD_MENU_HELP_PARENT_START_HERE="Start Here"
72+
MOD_MENU_HELP_PROGRAMMERS="Documentation for Joomla! Programmers"
7273
MOD_MENU_HELP_RESOURCES="Joomla! Resources"
7374
MOD_MENU_HELP_SECURITY="Security Centre"
7475
MOD_MENU_HELP_SHOP="Joomla! Shop"

‎build/media_source/system/js/joomla-dialog.w-c.es6.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ class JoomlaDialog extends HTMLElement {
116116
this.preferredParent = null;
117117
// @internal. Parent of the popupContent for cases when it is HTMLElement. Need for recovery on destroy().
118118
this.popupContentSrcLocation = null;
119+
// @internal. Hold properties addressed directly to <dialog> element, like "aria-".
120+
this.dialogProps = {};
119121

120122
if (!config) return;
121123

@@ -127,6 +129,13 @@ class JoomlaDialog extends HTMLElement {
127129
}
128130
});
129131

132+
// Check for properties which should be applied to the <dialog> not to the <JoomlaDialog>, like "aria-".
133+
['ariaLabelledby', 'ariaLabel'].forEach((key) => {
134+
if (config[key] !== undefined) {
135+
this.dialogProps[key] = config[key];
136+
}
137+
});
138+
130139
// Check class name
131140
if (config.className) {
132141
this.classList.add(...config.className.split(' '));
@@ -191,6 +200,11 @@ class JoomlaDialog extends HTMLElement {
191200
this.dialog.addEventListener('close', onClose);
192201
this.appendChild(this.dialog);
193202

203+
// Apply dialog properties if any
204+
Object.entries(this.dialogProps).forEach(([k, v]) => {
205+
this.dialog[k] = v;
206+
});
207+
194208
// Get template parts
195209
this.popupTmplH = this.dialog.querySelector('.joomla-dialog-header');
196210
this.popupTmplB = this.dialog.querySelector('.joomla-dialog-body');
@@ -214,6 +228,11 @@ class JoomlaDialog extends HTMLElement {
214228
i.classList.add(...this.iconHeader.split(' '));
215229
this.popupTmplH.insertAdjacentElement('afterbegin', i);
216230
}
231+
232+
// Set aria-label if it is still missing
233+
if (!this.dialog.ariaLabel) {
234+
this.dialog.ariaLabel = this.textHeader;
235+
}
217236
}
218237

219238
// Set the body

‎cli/joomla.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
echo 'Your command line php needs to be version ' . JOOMLA_MINIMUM_PHP . ' or newer to run the Joomla! CLI Tools' . PHP_EOL;
2020
echo 'The version of PHP currently running this code, at the command line, is PHP version ' . PHP_VERSION . '.' . PHP_EOL;
2121
echo 'Please note, the version of PHP running your commands here, may be different to the version that is used by ';
22-
echo 'your web server to run the Joomla! Web Application' . PHP_EOL;
22+
echo 'your web server to run the Joomla! Web Application.' . PHP_EOL;
2323

2424
exit;
2525
}

‎installation/language/da-DK/joomla.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ INSTL_DATABASE_NO_SCHEMA="Intet databaseskema eksisterer for denne databasetype"
9393
INSTL_DATABASE_PASSWORD_DESC="Angiv database adgangskoden som du oprettede eller en adgangskode som din host har leveret."
9494
INSTL_DATABASE_PREFIX_DESC="Angiv et tabelpræfiks eller anvend det tilfældigt genererede."
9595
INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Hvis du anvende en eksisterende database med tabeller med det samme præfiks, så vil Joomla omdøbe disse eksisterende tabeller ved at tilføje præfikset \"bak_\"."
96+
INSTL_DATABASE_PREFIX_MSG="Tabel præfikset skal starte med det bogstav, og eventuelt efterfulgt af alfanumeriske karakterer, og skal slutte med en underscore."
9697
INSTL_DATABASE_RESPONSE_ERROR="Installationsprocessen fejlede."
9798
INSTL_DATABASE_TYPE_DESC="Vælg databasetypen."
9899
INSTL_DATABASE_USER_DESC="Angiv database brugernavnet som du oprettede eller et brugernavn som din host leverede."

0 commit comments

Comments
 (0)