Merge branch '3.1-stable' into develop

Note: This intentionally reverts ee8324368f2844aae0d558f1d194419a2181c281

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/codeigniter/helpers/url_helper_test.php b/tests/codeigniter/helpers/url_helper_test.php
index f33189a3a..5f936568b 100644
--- a/tests/codeigniter/helpers/url_helper_test.php
+++ b/tests/codeigniter/helpers/url_helper_test.php
@@ -87,4 +87,13 @@ class Url_helper_test extends CI_TestCase {
 		}
 	}
 
+	// --------------------------------------------------------------------
+
+	public function test_issue_5331()
+	{
+		$this->assertEquals(
+			'this is some text that includes '.safe_mailto('www.email@domain.com').' which is causing an issue',
+			auto_link('this is some text that includes www.email@domain.com which is causing an issue')
+		);
+	}
 }