Merge tag 'v1.5.7'

Conflicts:
	Source/MantisSourceBase.class.php
	SourceHgWeb/SourceHgWeb.php
	docs/CHANGELOG.md

Author: dregad

SourceHgWeb/SourceHgWeb.php

@@ -19,7 +19,7 @@
 
 class SourceHgWebPlugin extends MantisSourcePlugin {
 
-	const PLUGIN_VERSION = '2.1.2';
+	const PLUGIN_VERSION = '2.1.3';
 	const FRAMEWORK_VERSION_REQUIRED = '2.0.0';
 
 	/**
@@ -264,11 +264,11 @@ private function commit_changeset( $p_repo, $p_input, $p_branch='' ) {
 		$t_parents = array();
 		static $s_pattern_metadata;
 		if( !$s_pattern_metadata ) {
-			$s_pattern_metadata = '/^# (?:'
+			$s_pattern_metadata = '/^# (?J)(?:'
 				. self::PATTERN_USER . '|'
 				. self::PATTERN_DATE . '|'
 				. self::PATTERN_REVISION
-				. ')/J';
+				. ')/';
 		}
 		while( true ) {
 			$t_match = preg_match( $s_pattern_metadata, $t_input[$i], $t_metadata );

docs/CHANGELOG.md

@@ -145,6 +145,13 @@ Includes all changes and fixes from 1.5.0.
 
 # Releases for MantisBT 1.3
 
+## [1.5.7] - 2018-07-30
+
+### Fixed
+
+- HgWeb: fix unsupported PCRE /J modifier on PHP < 7.2
+  [#275](https://github.com/mantisbt-plugins/source-integration/pull/275)
+
 ## [1.5.6] - 2018-06-13
 
 ### Fixed
@@ -346,7 +353,7 @@ Includes all changes and fixes from master-1.2.x branch, up to commit
 
 
 [Unreleased 2.x]: https://github.com/mantisbt-plugins/source-integration/compare/v2.1.2...HEAD
-[Unreleased 1.x]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.6...master-1.3.x
+[Unreleased 1.x]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.7...master-1.3.x
 
 [2.1.2]: https://github.com/mantisbt-plugins/source-integration/compare/v2.1.1...v2.1.2
 [2.1.1]: https://github.com/mantisbt-plugins/source-integration/compare/v2.1.0...v2.1.1
@@ -358,6 +365,7 @@ Includes all changes and fixes from master-1.2.x branch, up to commit
 [2.0.0-beta.2]: https://github.com/mantisbt-plugins/source-integration/compare/v2.0.0-beta.1...v2.0.0-beta.2
 [2.0.0-beta.1]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.2...v2.0.0-beta.1
 
+[1.5.7]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.6...v1.5.7
 [1.5.6]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.5...v1.5.6
 [1.5.5]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.4...v1.5.5
 [1.5.4]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.3...v1.5.4