Merge branch 'release-5.0.6'

2025-10-22 05:42:32 +02:00 · 2018-06-20 20:41:37 +02:00
parent 097a3e79a0 a2a63e2d29
commit 9e6b6a4c26
20 changed files with 31 additions and 20 deletions
--- a/8
+++ b/8
@@ -1,3 +1,11 @@
+Version 5.0.6 (2018-06-20)
+------------------------------------------------------------------------
+
+- Fix: Do not link inside `<syntaxhighlight></syntaxhighlight>` tags.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 5.0.5 (2017-10-17)
 ------------------------------------------------------------------------

--- a/README.md
+++ b/README.md
@@ -451,6 +451,7 @@ master branch if you want to install the extension for your own Wiki.
 -   Brent Laabs (@labster), code review and bug fixes
 -   @tetsuya-zama, bug fix
 -   @yoshida3669, namespace-related bug fixes
+-   Caleb Mingle (@dentafrice), bug fix


 ### Testing
@@ -521,7 +522,7 @@ fail and tell you about database problems.
 License
 -------

-Copyright 2012-2017 Daniel Kraus <mailto:bovender@bovender.de> (@bovender)
+Copyright 2012-2018 Daniel Kraus <mailto:bovender@bovender.de> (@bovender)

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/extension.json
+++ b/extension.json
@@ -5,11 +5,12 @@
                "Ulrich Strauss (c0nnex)",
                "Brent Laabs (labster)",
                "tetsuya-zama",
-                "yoshida"
+                "yoshida",
+                "Caleb Mingle (dentafrice)"
        ],
        "type": "parserhook",
        "url": "https://www.mediawiki.org/wiki/Extension:LinkTitles",
-        "version": "5.0.5",
+        "version": "5.0.6",
        "license-name": "GPL-2.0+",
        "descriptionmsg": "linktitles-desc",
        "requires": {
--- a/includes/Config.php
+++ b/includes/Config.php
@@ -2,7 +2,7 @@
 /**
 * The LinkTitles\Config class holds configuration for the LinkTitles extension.
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
--- a/includes/Extension.php
+++ b/includes/Extension.php
@@ -2,7 +2,7 @@
 /**
 * The LinkTitles\Extension class provides event handlers and entry points for the extension.
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2,7 +2,7 @@
 /**
 * The LinkTitles\Linker class does the heavy linking for the extension.
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/includes/Magic.php
+++ b/includes/Magic.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *      Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ *      Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *      
 *      This program is free software; you can redistribute it and/or modify
 *      it under the terms of the GNU General Public License as published by
--- a/includes/Source.php
+++ b/includes/Source.php
@@ -2,7 +2,7 @@
 /**
 * The LinkTitles\Source represents a Wiki page to which links may be added.
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/includes/Special.php
+++ b/includes/Special.php
@@ -2,7 +2,7 @@
 /**
 * Provides a special page for the LinkTitles extension.
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/includes/Splitter.php
+++ b/includes/Splitter.php
@@ -2,7 +2,7 @@
 /**
 * The Splitter class caches a regular expression that delimits text to be parsed.
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -134,6 +134,7 @@ class Splitter {
 			'<nowiki>.*?<.nowiki>|<code>.*?<\/code>|' . // nowiki/code
 			'<pre>.*?<\/pre>|<html>.*?<\/html>|' .      // pre/html
 			'<script>.*?<\/script>|' .                  // script
+			'<syntaxhighlight.*?>.*?<\/syntaxhighlight>|' .                  // syntaxhighlight
 			'<gallery>.*?<\/gallery>|' .                // gallery
 			'<div.*?>|<\/div>|' .                       // attributes of div elements
 			'<span.*?>|<\/span>|' .                     // attributes of span elements
--- a/includes/Target.php
+++ b/includes/Target.php
@@ -2,7 +2,7 @@
 /**
 * The LinkTitles\Target represents a Wiki page that is a potential link target.
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/includes/Targets.php
+++ b/includes/Targets.php
@@ -2,7 +2,7 @@
 /**
 * The LinkTitles\Targets class.
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/linktitles-cli.php
+++ b/linktitles-cli.php
@@ -2,7 +2,7 @@
 /**
 * LinkTitles command line interface (CLI)/maintenance script
 *
- *  Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> @bovender
+ *  Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> @bovender
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
--- a/tests/phpunit/ConfigTest.php
+++ b/tests/phpunit/ConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/tests/phpunit/ExtensionTest.php
+++ b/tests/phpunit/ExtensionTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/tests/phpunit/LinkerTest.php
+++ b/tests/phpunit/LinkerTest.php
@@ -2,7 +2,7 @@
 /**
 * Unit tests for the Linker class, i.e. the core functionality
 *
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/tests/phpunit/SplitterTest.php
+++ b/tests/phpunit/SplitterTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/tests/phpunit/TargetTest.php
+++ b/tests/phpunit/TargetTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/tests/phpunit/TargetsTest.php
+++ b/tests/phpunit/TargetsTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/tests/phpunit/TestCase.php
+++ b/tests/phpunit/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
+ * Copyright 2012-2018 Daniel Kraus <bovender@bovender.de> ('bovender')
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by