Skip to content

Commit 406fcdd

Browse files
committed
Release 5.2.0 Beta 1
1 parent 71b41e8 commit 406fcdd

File tree

49 files changed

+244
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+244
-106
lines changed

administrator/components/com_associations/src/View/Associations/HtmlView.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class HtmlView extends BaseHtmlView
7070
*
7171
* @var string
7272
*
73-
* @since __DEPLOY_VERSION__
73+
* @since 5.2.0
7474
*/
7575
public $extensionName;
7676

@@ -79,7 +79,7 @@ class HtmlView extends BaseHtmlView
7979
*
8080
* @var string
8181
*
82-
* @since __DEPLOY_VERSION__
82+
* @since 5.2.0
8383
*/
8484
public $typeName;
8585

@@ -88,7 +88,7 @@ class HtmlView extends BaseHtmlView
8888
*
8989
* @var string[]
9090
*
91-
* @since __DEPLOY_VERSION__
91+
* @since 5.2.0
9292
*/
9393
public $typeSupports;
9494

@@ -97,7 +97,7 @@ class HtmlView extends BaseHtmlView
9797
*
9898
* @var string[]
9999
*
100-
* @since __DEPLOY_VERSION__
100+
* @since 5.2.0
101101
*/
102102
public $typeFields;
103103

administrator/components/com_categories/src/View/Category/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class HtmlView extends BaseHtmlView
8181
*
8282
* @var string[]
8383
*
84-
* @since __DEPLOY_VERSION__
84+
* @since 5.2.0
8585
*/
8686
public $ignore_fieldsets = [];
8787

administrator/components/com_config/src/View/Component/HtmlView.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class HtmlView extends BaseHtmlView
5656
*
5757
* @var object[]
5858
*
59-
* @since __DEPLOY_VERSION__
59+
* @since 5.2.0
6060
*/
6161
public $fieldsets;
6262

@@ -65,7 +65,7 @@ class HtmlView extends BaseHtmlView
6565
*
6666
* @var string
6767
*
68-
* @since __DEPLOY_VERSION__
68+
* @since 5.2.0
6969
*/
7070
public $formControl;
7171

@@ -74,7 +74,7 @@ class HtmlView extends BaseHtmlView
7474
*
7575
* @var string
7676
*
77-
* @since __DEPLOY_VERSION__
77+
* @since 5.2.0
7878
*/
7979
public $return;
8080

administrator/components/com_contact/src/View/Contact/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class HtmlView extends BaseHtmlView
5757
*
5858
* @var string[]
5959
*
60-
* @since __DEPLOY_VERSION__
60+
* @since 5.2.0
6161
*/
6262
public $ignore_fieldsets = [];
6363

administrator/components/com_content/src/View/Article/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class HtmlView extends BaseHtmlView
7474
*
7575
* @var string[]
7676
*
77-
* @since __DEPLOY_VERSION__
77+
* @since 5.2.0
7878
*/
7979
public $ignore_fieldsets = [];
8080

administrator/components/com_finder/src/View/Filter/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class HtmlView extends BaseHtmlView
7979
*
8080
* @var string[]
8181
*
82-
* @since __DEPLOY_VERSION__
82+
* @since 5.2.0
8383
*/
8484
public $ignore_fieldsets = [];
8585

administrator/components/com_installer/src/View/Discover/HtmlView.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class HtmlView extends InstallerViewDefault
2929
*
3030
* @var array
3131
*
32-
* @since __DEPLOY_VERSION__
32+
* @since 5.2.0
3333
*/
3434
protected $items;
3535

@@ -38,7 +38,7 @@ class HtmlView extends InstallerViewDefault
3838
*
3939
* @var \Joomla\CMS\Pagination\Pagination
4040
*
41-
* @since __DEPLOY_VERSION__
41+
* @since 5.2.0
4242
*/
4343
protected $pagination;
4444

administrator/components/com_mails/src/Field/MailtemplateLayoutField.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
* Form Field to display a list of the layouts for a field from
2626
* the extension or template overrides.
2727
*
28-
* @since __DEPLOY_VERSION__
28+
* @since 5.2.0
2929
*/
3030
class MailtemplateLayoutField extends FormField
3131
{
3232
/**
3333
* The form field type.
3434
*
3535
* @var string
36-
* @since __DEPLOY_VERSION__
36+
* @since 5.2.0
3737
*/
3838
protected $type = 'MailtemplateLayout';
3939

@@ -42,7 +42,7 @@ class MailtemplateLayoutField extends FormField
4242
*
4343
* @return string The field input.
4444
*
45-
* @since __DEPLOY_VERSION__
45+
* @since 5.2.0
4646
*/
4747
protected function getInput()
4848
{

administrator/components/com_menus/src/View/Item/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class HtmlView extends BaseHtmlView
7878
*
7979
* @var string[]
8080
*
81-
* @since __DEPLOY_VERSION__
81+
* @since 5.2.0
8282
*/
8383
public $ignore_fieldsets = [];
8484

administrator/components/com_modules/src/View/Module/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class HtmlView extends BaseHtmlView
6464
*
6565
* @var string[]
6666
*
67-
* @since __DEPLOY_VERSION__
67+
* @since 5.2.0
6868
*/
6969
public $ignore_fieldsets = [];
7070

administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class HtmlView extends BaseHtmlView
6363
*
6464
* @var string[]
6565
*
66-
* @since __DEPLOY_VERSION__
66+
* @since 5.2.0
6767
*/
6868
public $ignore_fieldsets = [];
6969

administrator/components/com_plugins/src/View/Plugin/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class HtmlView extends BaseHtmlView
5454
*
5555
* @var string[]
5656
*
57-
* @since __DEPLOY_VERSION__
57+
* @since 5.2.0
5858
*/
5959
public $ignore_fieldsets = [];
6060

administrator/components/com_postinstall/src/View/Messages/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class HtmlView extends BaseHtmlView
3232
*
3333
* @var array
3434
*
35-
* @since __DEPLOY_VERSION__
35+
* @since 5.2.0
3636
*/
3737
protected $items;
3838

administrator/components/com_scheduler/src/View/Task/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class HtmlView extends BaseHtmlView
7272
*
7373
* @var string[]
7474
*
75-
* @since __DEPLOY_VERSION__
75+
* @since 5.2.0
7676
*/
7777
public $ignore_fieldsets = [];
7878

administrator/components/com_tags/src/View/Tag/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class HtmlView extends BaseHtmlView
7272
*
7373
* @var string[]
7474
*
75-
* @since __DEPLOY_VERSION__
75+
* @since 5.2.0
7676
*/
7777
public $ignore_fieldsets = [];
7878

administrator/components/com_templates/src/View/Style/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class HtmlView extends BaseHtmlView
6464
*
6565
* @var string[]
6666
*
67-
* @since __DEPLOY_VERSION__
67+
* @since 5.2.0
6868
*/
6969
public $ignore_fieldsets = [];
7070

administrator/components/com_users/src/Model/LevelModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class LevelModel extends AdminModel
3838
*
3939
* @return boolean True if successful, false if an error occurs.
4040
*
41-
* @since __DEPLOY_VERSION__
41+
* @since 5.2.0
4242
*/
4343
public function delete(&$pks)
4444
{

administrator/components/com_users/src/Model/UserModel.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,15 @@ public function save($data)
268268
}
269269
}
270270

271+
// Unset the username if it should not be overwritten
272+
if (
273+
!$my->authorise('core.manage', 'com_users')
274+
&& (int) $user->id === (int) $my->id
275+
&& !ComponentHelper::getParams('com_users')->get('change_login_name')
276+
) {
277+
unset($data['username']);
278+
}
279+
271280
// Bind the data.
272281
if (!$user->bind($data)) {
273282
$this->setError($user->getError());

administrator/components/com_users/src/View/Group/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class HtmlView extends BaseHtmlView
5757
*
5858
* @var string[]
5959
*
60-
* @since __DEPLOY_VERSION__
60+
* @since 5.2.0
6161
*/
6262
public $ignore_fieldsets = [];
6363

administrator/components/com_users/src/View/User/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class HtmlView extends BaseHtmlView implements UserFactoryAwareInterface
8383
*
8484
* @var string[]
8585
*
86-
* @since __DEPLOY_VERSION__
86+
* @since 5.2.0
8787
*/
8888
public $ignore_fieldsets = [];
8989

administrator/components/com_workflow/src/View/Transition/HtmlView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class HtmlView extends BaseHtmlView
9999
*
100100
* @var string[]
101101
*
102-
* @since __DEPLOY_VERSION__
102+
* @since 5.2.0
103103
*/
104104
public $ignore_fieldsets = [];
105105

administrator/manifests/files/joomla.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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.0-alpha4-dev</version>
9+
<version>5.2.0-beta1</version>
1010
<creationDate>2024-08</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

components/com_contact/src/Controller/ContactController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
283283
$mailer->addRecipient($contact->email_to);
284284
$mailer->setReplyTo($templateData['email'], $templateData['name']);
285285
$mailer->addTemplateData($templateData);
286+
$mailer->addUnsafeTags(['name', 'email', 'body', 'customfields']);
286287
$sent = $mailer->send();
287288

288289
// If we are supposed to copy the sender, do so.

components/com_users/src/Model/RegistrationModel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ public function register($temp)
512512
$mailer = new MailTemplate($mailtemplate, $app->getLanguage()->getTag());
513513
$mailer->addTemplateData($data);
514514
$mailer->addRecipient($data['email']);
515+
$mailer->addUnsafeTags(['username', 'password_clear', 'name']);
515516
$return = $mailer->send();
516517
} catch (\Exception $exception) {
517518
try {

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
"type": "vcs",
3636
"url": "https://github.com/joomla-backports/php-tuf.git",
3737
"no-api": true
38+
},
39+
{
40+
"type": "vcs",
41+
"url": "https://github.com/joomla-framework/security-filter.git"
3842
}
3943
],
4044
"autoload": {
@@ -59,7 +63,7 @@
5963
"joomla/database": "^3.2",
6064
"joomla/di": "^3.0.1",
6165
"joomla/event": "^3.0.1",
62-
"joomla/filter": "^3.0.1",
66+
"joomla/filter": "dev-3x-outputfilter-case as 3.0.2",
6367
"joomla/filesystem": "^3.0.1",
6468
"joomla/http": "^3.0.1",
6569
"joomla/input": "~3.0",

0 commit comments

Comments
 (0)