Merge branch 'release-5.0.8'

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "gh-pages"]
-	path = gh-pages
-	url = git@github.com:bovender/LinkTitles.git
-	branch = gh-pages

README.md

@@ -452,6 +452,7 @@ master branch if you want to install the extension for your own Wiki.
 -   @tetsuya-zama, bug fix
 -   @yoshida3669, namespace-related bug fixes
 -   Caleb Mingle (@dentafrice), bug fix
+-   @paladox, bug fixes
 
 
 ### Testing

includes/Special.php

@@ -146,7 +146,7 @@ class Special extends \SpecialPage {
 			$start += 1;
 
 			// Check if the time limit is exceeded
-			if ( microtime( true ) - $startTime > $config->specialPageReloadAfter )
+			if ( microtime( true ) - $startTime > $this->config->specialPageReloadAfter )
 			{
 				break;
 			}

tests/phpunit/LinkerTest.php

@@ -85,6 +85,21 @@ class LinkTitlesLinkerTest extends LinkTitles\TestCase {
 		];
 	}
 
+	/**
+	 * Test issue #39, https://github.com/bovender/LinkTitles/issues/39
+	 */
+	public function testNoautolinks() {
+		$config = new LinkTitles\Config();
+		$config->firstOnly = false;
+		LinkTitles\Splitter::invalidate();
+		$input = 'This is a text with <noautolinks><nowiki>link target</nowiki></noautolinks>';
+		$source = LinkTitles\Source::createFromTitleAndText( $this->title, $input, $config );
+		$linker = new LinkTitles\Linker( $config );
+		$result = $linker->linkContent( $source );
+		if ( !$result ) { $result = $input; }
+		$this->assertSame( $input, $result );
+	}
+
 	/**
 	 * @dataProvider provideLinkContentTemplatesData
 	 */