Skip to content

Commit ac793f3

Browse files
HackwarHackwar
committed
Joomla! 5.2.3
1 parent 56c8b84 commit ac793f3

File tree

19 files changed

+143
-84
lines changed

19 files changed

+143
-84
lines changed

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

Lines changed: 1 addition & 1 deletion
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>5.2.3</version>
6-
<creationDate>2024-12</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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="administrator">
33
<name>English (en-GB)</name>
44
<version>5.2.3</version>
5-
<creationDate>2024-12</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‎

Lines changed: 2 additions & 2 deletions
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>5.2.3-dev</version>
10-
<creationDate>2024-12</creationDate>
9+
<version>5.2.3</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‎

Lines changed: 1 addition & 1 deletion
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>5.2.3.1</version>
6-
<creationDate>2024-12</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‎

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

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

Lines changed: 1 addition & 1 deletion
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>5.2.3</version>
6-
<creationDate>2024-12</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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="api">
33
<name>English (en-GB)</name>
44
<version>5.2.3</version>
5-
<creationDate>2024-12</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‎

Lines changed: 0 additions & 10 deletions
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;
@@ -39,15 +38,6 @@ public function display($cachable = false, $urlparams = [])
3938
{
4039
$view = $this->input->get('view', $this->default_view);
4140

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

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

Lines changed: 47 additions & 0 deletions
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 5.2.3
24+
*/
25+
class Dispatcher extends ComponentDispatcher
26+
{
27+
/**
28+
* Method to check component access permission
29+
*
30+
* @since 5.2.3
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‎

Lines changed: 3 additions & 55 deletions
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;
@@ -50,61 +48,11 @@ public function display($cachable = false, $urlparams = false)
5048
if ($view = $this->getView($vName, $vFormat)) {
5149
// Do any specific processing by view.
5250
switch ($vName) {
53-
case 'registration':
54-
// If the user is already logged in, redirect to the profile page.
55-
$user = $this->app->getIdentity();
56-
57-
if ($user->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-
case 'profile':
77-
// Handle view specific models.
78-
// If the user is a guest, redirect to the login page.
79-
$user = $this->app->getIdentity();
80-
81-
if ($user->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-
case 'login':
92-
// Handle the default views.
93-
$model = $this->getModel($vName);
94-
break;
95-
9651
case 'remind':
9752
case 'reset':
98-
// If the user is already logged in, redirect to the profile page.
99-
$user = $this->app->getIdentity();
100-
101-
if ($user->guest != 1) {
102-
// Redirect to profile page.
103-
$this->setRedirect(Route::_('index.php?option=com_users&view=profile', false));
104-
105-
return;
106-
}
107-
53+
case 'registration':
54+
case 'login':
55+
case 'profile':
10856
$model = $this->getModel($vName);
10957
break;
11058

0 commit comments

Comments
 (0)