From 58678ff21c9fefd8eed11ad7cd0bbdb1254e49e7 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 13 Mar 2016 12:20:09 +0100
Subject: [PATCH 1/3] [ticket/14527] Retrieve link URL from href and not link
 text

PHPBB3-14527
---
 phpBB/includes/functions.php         | 2 +-
 phpBB/includes/functions_content.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index be51a7342d..d984f41b08 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2745,7 +2745,7 @@ function get_preg_expression($mode)
 			return array(
 				'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
 				'#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&amp;|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#',
-				'#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">(.*?)</a><!\-\- \1 \-\->#',
+				'#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">.*?</a><!\-\- \1 \-\->#',
 				'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
 				'#<!\-\- .*? \-\->#s',
 				'#<.*?>#s',
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 39a3f0352f..cfa713daab 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -469,7 +469,7 @@ function decode_message(&$message, $bbcode_uid = '')
 		$message = str_replace($match, $replace, $message);
 
 		$match = get_preg_expression('bbcode_htm');
-		$replace = array('\1', '\1', '\3', '\1', '', '');
+		$replace = array('\1', '\1', '\2', '\1', '', '');
 
 		$message = preg_replace($match, $replace, $message);
 	}

From dad531e4b2c19dd22b8dd6a15e410e187a67fe46 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 13 Mar 2016 12:29:55 +0100
Subject: [PATCH 2/3] [ticket/14527] Add tests for reverted improper fix

PHPBB3-14527
---
 tests/text_processing/decode_message_test.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/text_processing/decode_message_test.php b/tests/text_processing/decode_message_test.php
index 7de599f2b1..6ee5f91578 100644
--- a/tests/text_processing/decode_message_test.php
+++ b/tests/text_processing/decode_message_test.php
@@ -16,6 +16,15 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 
 class phpbb_text_processing_decode_message_test extends phpbb_test_case
 {
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_dispatcher;
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+	}
+
 	/**
 	* @dataProvider get_legacy_tests
 	*/
@@ -40,12 +49,20 @@ class phpbb_text_processing_decode_message_test extends phpbb_test_case
 			),
 			array(
 				'<!-- w --><a class="postlink" href="http://www.phpbb.com">www.phpbb.com</a><!-- w -->',
-				'www.phpbb.com'
+				'http://www.phpbb.com'
 			),
 			array(
 				'<!-- m --><a class="postlink" href="http://www.phpbb.com">http://www.phpbb.com</a><!-- m -->',
 				'http://www.phpbb.com'
 			),
+			array(
+				'<!-- m --><a class="postlink" href="http://www.phpbb.com">this is just text</a><!-- m -->',
+				'http://www.phpbb.com'
+			),
+			array(
+				'<!-- m --><a class="postlink" href="http://www.phpbb.com/some/more/link/that/is/shortened">http://www.phpbb.com/some/ ... /shortened</a><!-- m -->',
+				'http://www.phpbb.com/some/more/link/that/is/shortened'
+			),
 			/**
 			* Fails as per PHPBB3-8420
 			* @link http://tracker.phpbb.com/browse/PHPBB3-8420

From 17b8e93a5350e297f9be0925120f0b6cf34f5ffe Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 13 Mar 2016 14:48:21 +0100
Subject: [PATCH 3/3] [ticket/14527] Decode automatically generated postlink
 without prefix

The http prefix gets automatically added and should be removed prior
to outputting the post to the user.

PHPBB3-14527
---
 phpBB/includes/functions.php                  | 1 +
 phpBB/includes/functions_content.php          | 2 +-
 tests/text_processing/decode_message_test.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d984f41b08..8d727fb414 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2745,6 +2745,7 @@ function get_preg_expression($mode)
 			return array(
 				'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
 				'#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&amp;|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#',
+				'#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="http://(.*?)">\2</a><!\-\- \1 \-\->#',
 				'#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">.*?</a><!\-\- \1 \-\->#',
 				'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
 				'#<!\-\- .*? \-\->#s',
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index cfa713daab..df4a51db98 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -469,7 +469,7 @@ function decode_message(&$message, $bbcode_uid = '')
 		$message = str_replace($match, $replace, $message);
 
 		$match = get_preg_expression('bbcode_htm');
-		$replace = array('\1', '\1', '\2', '\1', '', '');
+		$replace = array('\1', '\1', '\2', '\2', '\1', '', '');
 
 		$message = preg_replace($match, $replace, $message);
 	}
diff --git a/tests/text_processing/decode_message_test.php b/tests/text_processing/decode_message_test.php
index 6ee5f91578..fd1719fedc 100644
--- a/tests/text_processing/decode_message_test.php
+++ b/tests/text_processing/decode_message_test.php
@@ -49,7 +49,7 @@ class phpbb_text_processing_decode_message_test extends phpbb_test_case
 			),
 			array(
 				'<!-- w --><a class="postlink" href="http://www.phpbb.com">www.phpbb.com</a><!-- w -->',
-				'http://www.phpbb.com'
+				'www.phpbb.com'
 			),
 			array(
 				'<!-- m --><a class="postlink" href="http://www.phpbb.com">http://www.phpbb.com</a><!-- m -->',