Skip to content

Commit f96de25

Browse files
committed
Merge branch '13x' into hotfix/2.3.1
# Conflicts: # Source/MantisSourceBase.class.php # docs/CHANGELOG.md
2 parents 2a5fd3a + e836799 commit f96de25

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

Source/MantisSourceBase.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ abstract class MantisSourceBase extends MantisPlugin
1919
* a change in the minimum required MantisBT version: 0=1.2; 1=1.3, 2=2.x.
2020
* The framework version is incremented when the plugin's core files change.
2121
*/
22-
const FRAMEWORK_VERSION = '2.3.0';
22+
const FRAMEWORK_VERSION = '2.3.1';
2323

2424
/**
2525
* Minimum required MantisBT version.

Source/pages/repo_delete.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
$t_repo = SourceRepo::load( $f_repo_id );
1212

13-
helper_ensure_confirmed( sprintf( plugin_lang_get( 'ensure_delete' ), $t_repo->name ), plugin_lang_get( 'delete_repository' ) );
13+
$t_message = sprintf( plugin_lang_get( 'ensure_delete' ), string_attribute( $t_repo->name ) );
14+
helper_ensure_confirmed( $t_message, plugin_lang_get( 'delete_repository' ) );
1415

1516
SourceRepo::delete( $t_repo->id );
1617

docs/CHANGELOG.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,14 @@ Includes all changes and fixes from [1.5.0](#150---2017-03-06).
224224

225225
# Releases for MantisBT 1.3
226226

227+
## [1.6.2] - 2020-02-13
228+
229+
### Security
230+
231+
- Fix XSS in Delete Repository page (CVE request pending)
232+
[#338](https://github.com/mantisbt-plugins/source-integration/issues/338)
233+
234+
227235
## [1.6.1] - 2019-03-26
228236

229237
### Fixed
@@ -244,7 +252,7 @@ Includes all changes and fixes from [1.5.0](#150---2017-03-06).
244252

245253
### Security
246254

247-
- Fix XSS in Manage Repository and Changesets List pages (CVE request pending)
255+
- Fix XSS in Manage Repository and Changesets List pages (CVE-2018-16362)
248256
[#286](https://github.com/mantisbt-plugins/source-integration/issues/286)
249257

250258
## [1.5.8] - 2018-08-30
@@ -481,8 +489,9 @@ Includes all changes and fixes from master-1.2.x branch, up to commit
481489
[2.0.0-beta.2]: https://github.com/mantisbt-plugins/source-integration/compare/v2.0.0-beta.1...v2.0.0-beta.2
482490
[2.0.0-beta.1]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.2...v2.0.0-beta.1
483491

484-
[Unreleased 1.x]: https://github.com/mantisbt-plugins/source-integration/compare/v1.6.1...master-1.3.x
492+
[Unreleased 1.x]: https://github.com/mantisbt-plugins/source-integration/compare/v1.6.2...master-1.3.x
485493

494+
[1.6.2]: https://github.com/mantisbt-plugins/source-integration/compare/v1.6.1...v1.6.2
486495
[1.6.1]: https://github.com/mantisbt-plugins/source-integration/compare/v1.6.0...v1.6.1
487496
[1.6.0]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.9...v1.6.0
488497
[1.5.9]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.8...v1.5.9

0 commit comments

Comments
 (0)