Skip to content
This repository was archived by the owner on Nov 3, 2023. It is now read-only.

Commit e38d7e6

Browse files
committed
Version 3.5.40
1 parent 36db3b8 commit e38d7e6

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

system/config/constants.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Core version
1414
*/
1515
define('VERSION', '3.5');
16-
define('BUILD', '39');
16+
define('BUILD', '40');
1717
define('LONG_TERM_SUPPORT', true);
1818

1919

system/docs/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Contao Open Source CMS changelog
22
================================
33

4+
Version 3.5.40 (2019-04-10)
5+
---------------------------
6+
7+
### Fixed
8+
Fix the save callback in the back end password module (see #429).
9+
10+
411
Version 3.5.39 (2019-04-09)
512
---------------------------
613

system/modules/core/controllers/BackendPassword.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,19 @@ public function run()
8383
// Trigger the save_callback
8484
if (is_array($GLOBALS['TL_DCA']['tl_user']['fields']['password']['save_callback']))
8585
{
86+
$dc = new \DC_Table('tl_user');
87+
$dc->id = $this->User->id;
88+
8689
foreach ($GLOBALS['TL_DCA']['tl_user']['fields']['password']['save_callback'] as $callback)
8790
{
8891
if (is_array($callback))
8992
{
9093
$this->import($callback[0]);
91-
$pw = $this->{$callback[0]}->{$callback[1]}($pw);
94+
$pw = $this->{$callback[0]}->{$callback[1]}($pw, $dc);
9295
}
9396
elseif (is_callable($callback))
9497
{
95-
$pw = $callback($pw);
98+
$pw = $callback($pw, $dc);
9699
}
97100
}
98101
}

system/modules/repository/classes/RepositorySettings.php

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
// valid core versions in descending order
1919
define('REPOSITORY_COREVERSIONS',
20+
'30050409,30050409;'. // 3.5.40
2021
'30050399,30050399;'. // 3.5.39
2122
'30050389,30050389;'. // 3.5.38
2223
'30050379,30050379;'. // 3.5.37

0 commit comments

Comments
 (0)