Skip to content

Commit a214bde

Browse files
MacJoomMacJoom
committed
Joomla! 4.4.10 Stable
1 parent 7c8b3da commit a214bde

File tree

19 files changed

+142
-84
lines changed

19 files changed

+142
-84
lines changed

‎administrator/language/en-GB/install.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<name>English (en-GB)</name>
44
<tag>en-GB</tag>
55
<version>4.4.10</version>
6-
<creationDate>2024-10</creationDate>
6+
<creationDate>2025-01</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>www.joomla.org</authorUrl>

‎administrator/language/en-GB/langmetadata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="administrator">
33
<name>English (en-GB)</name>
44
<version>4.4.10</version>
5-
<creationDate>2024-10</creationDate>
5+
<creationDate>2025-01</creationDate>
66
<author>Joomla! Project</author>
77
<authorEmail>[email protected]</authorEmail>
88
<authorUrl>www.joomla.org</authorUrl>

‎administrator/manifests/files/joomla.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>4.4.10-dev</version>
10-
<creationDate>2024-10</creationDate>
9+
<version>4.4.10</version>
10+
<creationDate>2025-01</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

1313
<scriptfile>administrator/components/com_admin/script.php</scriptfile>

‎administrator/manifests/packages/pkg_en-GB.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<name>English (en-GB) Language Pack</name>
44
<packagename>en-GB</packagename>
55
<version>4.4.10.1</version>
6-
<creationDate>2024-10</creationDate>
6+
<creationDate>2025-01</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>www.joomla.org</authorUrl>

‎administrator/modules/mod_quickicon/tmpl/default.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
$html = HTMLHelper::_('icons.buttons', $buttons);
2424
?>
2525
<?php if (!empty($html)) : ?>
26-
<nav class="quick-icons px-3 pb-3" aria-label="<?php echo Text::_('MOD_QUICKICON_NAV_LABEL') . ' ' . $module->title; ?>">
26+
<nav class="quick-icons px-3 pb-3" aria-label="<?php echo Text::_('MOD_QUICKICON_NAV_LABEL') . ' ' . htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8'); ?>">
2727
<ul class="nav flex-wrap">
2828
<?php echo $html; ?>
2929
</ul>

‎api/language/en-GB/install.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<name>English (en-GB)</name>
44
<tag>en-GB</tag>
55
<version>4.4.10</version>
6-
<creationDate>2024-10</creationDate>
6+
<creationDate>2025-01</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>www.joomla.org</authorUrl>

‎api/language/en-GB/langmetadata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="api">
33
<name>English (en-GB)</name>
44
<version>4.4.10</version>
5-
<creationDate>2024-10</creationDate>
5+
<creationDate>2025-01</creationDate>
66
<author>Joomla! Project</author>
77
<authorEmail>[email protected]</authorEmail>
88
<authorUrl>www.joomla.org</authorUrl>

‎components/com_privacy/src/Controller/DisplayController.php

+2-11
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
namespace Joomla\Component\Privacy\Site\Controller;
1212

1313
use Joomla\CMS\MVC\Controller\BaseController;
14-
use Joomla\CMS\Router\Route;
1514

1615
// phpcs:disable PSR1.Files.SideEffects
1716
\defined('_JEXEC') or die;
@@ -28,7 +27,8 @@ class DisplayController extends BaseController
2827
* Method to display a view.
2928
*
3029
* @param boolean $cachable If true, the view output will be cached
31-
* @param array $urlparams An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
30+
* @param array $urlparams An array of safe URL parameters and their variable types.
31+
* @see \Joomla\CMS\Filter\InputFilter::clean() for valid values.
3232
*
3333
* @return $this
3434
*
@@ -38,15 +38,6 @@ public function display($cachable = false, $urlparams = [])
3838
{
3939
$view = $this->input->get('view', $this->default_view);
4040

41-
// Submitting information requests and confirmation through the frontend is restricted to authenticated users at this time
42-
if (in_array($view, ['confirm', 'request']) && $this->app->getIdentity()->guest) {
43-
$this->setRedirect(
44-
Route::_('index.php?option=com_users&view=login&return=' . base64_encode('index.php?option=com_privacy&view=' . $view), false)
45-
);
46-
47-
return $this;
48-
}
49-
5041
// Set a Referrer-Policy header for views which require it
5142
if (in_array($view, ['confirm', 'remind'])) {
5243
$this->app->setHeader('Referrer-Policy', 'no-referrer', true);

‎components/com_privacy/src/Dispatcher/Dispatcher.php

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
3+
/**
4+
* @package Joomla.Site
5+
* @subpackage com_privacy
6+
*
7+
* @copyright (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
8+
* @license GNU General Public License version 2 or later; see LICENSE.txt
9+
*/
10+
11+
namespace Joomla\Component\Privacy\Site\Dispatcher;
12+
13+
use Joomla\CMS\Dispatcher\ComponentDispatcher;
14+
use Joomla\CMS\Router\Route;
15+
16+
// phpcs:disable PSR1.Files.SideEffects
17+
\defined('_JEXEC') or die;
18+
// phpcs:enable PSR1.Files.SideEffects
19+
20+
/**
21+
* ComponentDispatcher class for com_privacy
22+
*
23+
* @since 4.4.10
24+
*/
25+
class Dispatcher extends ComponentDispatcher
26+
{
27+
/**
28+
* Method to check component access permission
29+
*
30+
* @since 4.4.10
31+
*
32+
* @return void
33+
*/
34+
protected function checkAccess()
35+
{
36+
parent::checkAccess();
37+
38+
$view = $this->input->get('view');
39+
40+
// Submitting information requests and confirmation through the frontend is restricted to authenticated users at this time
41+
if (\in_array($view, ['confirm', 'request']) && $this->app->getIdentity()->guest) {
42+
$this->app->redirect(
43+
Route::_('index.php?option=com_users&view=login&return=' . base64_encode('index.php?option=com_privacy&view=' . $view), false)
44+
);
45+
}
46+
}
47+
}

‎components/com_users/src/Controller/DisplayController.php

-54
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010

1111
namespace Joomla\Component\Users\Site\Controller;
1212

13-
use Joomla\CMS\Component\ComponentHelper;
1413
use Joomla\CMS\MVC\Controller\BaseController;
15-
use Joomla\CMS\Router\Route;
1614

1715
// phpcs:disable PSR1.Files.SideEffects
1816
\defined('_JEXEC') or die;
@@ -51,60 +49,10 @@ public function display($cachable = false, $urlparams = false)
5149
// Do any specific processing by view.
5250
switch ($vName) {
5351
case 'registration':
54-
// If the user is already logged in, redirect to the profile page.
55-
$user = $this->app->getIdentity();
56-
57-
if ($user->get('guest') != 1) {
58-
// Redirect to profile page.
59-
$this->setRedirect(Route::_('index.php?option=com_users&view=profile', false));
60-
61-
return;
62-
}
63-
64-
// Check if user registration is enabled
65-
if (ComponentHelper::getParams('com_users')->get('allowUserRegistration') == 0) {
66-
// Registration is disabled - Redirect to login page.
67-
$this->setRedirect(Route::_('index.php?option=com_users&view=login', false));
68-
69-
return;
70-
}
71-
72-
// The user is a guest, load the registration model and show the registration page.
73-
$model = $this->getModel('Registration');
74-
break;
75-
76-
// Handle view specific models.
7752
case 'profile':
78-
// If the user is a guest, redirect to the login page.
79-
$user = $this->app->getIdentity();
80-
81-
if ($user->get('guest') == 1) {
82-
// Redirect to login page.
83-
$this->setRedirect(Route::_('index.php?option=com_users&view=login', false));
84-
85-
return;
86-
}
87-
88-
$model = $this->getModel($vName);
89-
break;
90-
91-
// Handle the default views.
9253
case 'login':
93-
$model = $this->getModel($vName);
94-
break;
95-
9654
case 'remind':
9755
case 'reset':
98-
// If the user is already logged in, redirect to the profile page.
99-
$user = $this->app->getIdentity();
100-
101-
if ($user->get('guest') != 1) {
102-
// Redirect to profile page.
103-
$this->setRedirect(Route::_('index.php?option=com_users&view=profile', false));
104-
105-
return;
106-
}
107-
10856
$model = $this->getModel($vName);
10957
break;
11058

@@ -116,8 +64,6 @@ public function display($cachable = false, $urlparams = false)
11664

11765
return $controller->execute($task);
11866

119-
break;
120-
12167
default:
12268
$model = $this->getModel('Login');
12369
break;

‎components/com_users/src/Dispatcher/Dispatcher.php

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?php
2+
3+
/**
4+
* @package Joomla.Site
5+
* @subpackage com_privacy
6+
*
7+
* @copyright (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
8+
* @license GNU General Public License version 2 or later; see LICENSE.txt
9+
*/
10+
11+
namespace Joomla\Component\Users\Site\Dispatcher;
12+
13+
use Joomla\CMS\Component\ComponentHelper;
14+
use Joomla\CMS\Dispatcher\ComponentDispatcher;
15+
use Joomla\CMS\Router\Route;
16+
17+
// phpcs:disable PSR1.Files.SideEffects
18+
\defined('_JEXEC') or die;
19+
// phpcs:enable PSR1.Files.SideEffects
20+
21+
/**
22+
* ComponentDispatcher class for com_privacy
23+
*
24+
* @since 4.4.10
25+
*/
26+
class Dispatcher extends ComponentDispatcher
27+
{
28+
/**
29+
* Method to check component access permission
30+
*
31+
* @since 4.4.10
32+
*
33+
* @return void
34+
*/
35+
protected function checkAccess()
36+
{
37+
parent::checkAccess();
38+
39+
$view = $this->input->get('view');
40+
$user = $this->app->getIdentity();
41+
42+
// Do any specific processing by view.
43+
switch ($view) {
44+
case 'registration':
45+
// If the user is already logged in, redirect to the profile page.
46+
if ($user->get('guest') != 1) {
47+
// Redirect to profile page.
48+
$this->app->redirect(Route::_('index.php?option=com_users&view=profile', false));
49+
}
50+
51+
// Check if user registration is enabled
52+
if (ComponentHelper::getParams('com_users')->get('allowUserRegistration') == 0) {
53+
// Registration is disabled - Redirect to login page.
54+
$this->app->redirect(Route::_('index.php?option=com_users&view=login', false));
55+
}
56+
break;
57+
58+
// Handle view specific models.
59+
case 'profile':
60+
if ($user->get('guest') == 1) {
61+
// Redirect to login page.
62+
$this->app->redirect(Route::_('index.php?option=com_users&view=login', false));
63+
}
64+
break;
65+
66+
case 'remind':
67+
case 'reset':
68+
if ($user->get('guest') != 1) {
69+
// Redirect to profile page.
70+
$this->app->redirect(Route::_('index.php?option=com_users&view=profile', false));
71+
}
72+
}
73+
}
74+
}

‎installation/language/en-GB/langmetadata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>English (United Kingdom)</name>
44
<version>4.4.10</version>
5-
<creationDate>2024-10</creationDate>
5+
<creationDate>2025-01</creationDate>
66
<author>Joomla! Project</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎language/en-GB/install.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<name>English (en-GB)</name>
44
<tag>en-GB</tag>
55
<version>4.4.10</version>
6-
<creationDate>2024-10</creationDate>
6+
<creationDate>2025-01</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>www.joomla.org</authorUrl>

‎language/en-GB/langmetadata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="site">
33
<name>English (en-GB)</name>
44
<version>4.4.10</version>
5-
<creationDate>2024-10</creationDate>
5+
<creationDate>2025-01</creationDate>
66
<author>Joomla! Project</author>
77
<authorEmail>[email protected]</authorEmail>
88
<authorUrl>www.joomla.org</authorUrl>

‎layouts/chromes/html5.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
$moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
4242
$headerAttribs['id'] = 'mod-' . $module->id;
4343
else :
44-
$moduleAttribs['aria-label'] = $module->title;
44+
$moduleAttribs['aria-label'] = htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8');
4545
endif;
4646
}
4747

‎libraries/src/Version.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ final class Version
6666
* @var string
6767
* @since 3.8.0
6868
*/
69-
public const EXTRA_VERSION = 'dev';
69+
public const EXTRA_VERSION = '';
7070

7171
/**
7272
* Development status.
7373
*
7474
* @var string
7575
* @since 3.5
7676
*/
77-
public const DEV_STATUS = 'Development';
77+
public const DEV_STATUS = 'Stable';
7878

7979
/**
8080
* Code name.
@@ -90,15 +90,15 @@ final class Version
9090
* @var string
9191
* @since 3.5
9292
*/
93-
public const RELDATE = '15-October-2024';
93+
public const RELDATE = '7-January-2025';
9494

9595
/**
9696
* Release time.
9797
*
9898
* @var string
9999
* @since 3.5
100100
*/
101-
public const RELTIME = '16:01';
101+
public const RELTIME = '16:00';
102102

103103
/**
104104
* Release timezone.

‎modules/mod_menu/tmpl/default.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
$id = '';
2121

2222
if ($tagId = $params->get('tag_id', '')) {
23-
$id = ' id="' . $tagId . '"';
23+
$id = ' id="' . htmlspecialchars($tagId, ENT_QUOTES, 'UTF-8') . '"';
2424
}
2525

2626
// The menu class is deprecated. Use mod-menu instead

‎templates/cassiopeia/html/layouts/chromes/card.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
$moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
4040
$headerAttribs['id'] = 'mod-' . $module->id;
4141
else :
42-
$moduleAttribs['aria-label'] = $module->title;
42+
$moduleAttribs['aria-label'] = htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8');
4343
endif;
4444
}
4545

0 commit comments

Comments
 (0)