diocloid/LinkTitles
1
0
Fork 0
mirror of https://github.com/diocloid/LinkTitles.git synced 2025-07-13 09:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix detection of span and div elements without attributes.

Browse Source 
- Fix: Better detection of <span> and <div> elements that do not have attributes.
This commit is contained in:
Daniel Kraus
2017-09-05 08:58:04 +02:00
parent 3382336a45
commit a78a782f04
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/Splitter.php
View File

@ -135,8 +135,8 @@ class Splitter {
'<pre>.*?<\/pre>|<html>.*?<\/html>|' . // pre/html '<pre>.*?<\/pre>|<html>.*?<\/html>|' . // pre/html
'<script>.*?<\/script>|' . // script '<script>.*?<\/script>|' . // script
'<gallery>.*?<\/gallery>|' . // gallery '<gallery>.*?<\/gallery>|' . // gallery
'<div.+?>|<\/div>|' . // attributes of div elements '<div.*?>|<\/div>|' . // attributes of div elements
'<span.+?>|<\/span>|' . // attributes of span elements '<span.*?>|<\/span>|' . // attributes of span elements
'<file>[^<]*<\/file>|' . // stuff inside file elements '<file>[^<]*<\/file>|' . // stuff inside file elements
'style=".+?"|class=".+?"|' . // styles and classes (e.g. of wikitables) 'style=".+?"|class=".+?"|' . // styles and classes (e.g. of wikitables)
'<noautolinks>.*?<\/noautolinks>|' . // custom tag 'noautolinks' '<noautolinks>.*?<\/noautolinks>|' . // custom tag 'noautolinks'

5
tests/phpunit/LinkerTest.php
View File

@ -221,6 +221,11 @@ class LinkTitlesLinkerTest extends LinkTitles\TestCase {
"With parseHeadings = true,\n== a heading with link target in it ==\n should be linked", "With parseHeadings = true,\n== a heading with link target in it ==\n should be linked",
"With parseHeadings = true,\n== a heading with [[link target]] in it ==\n should be linked", "With parseHeadings = true,\n== a heading with [[link target]] in it ==\n should be linked",
], ],
[
true, // parseHeadings
"With parseHeadings = true,\n== <span>a heading with link target in ity/span> ==\n should be linked",
"With parseHeadings = true,\n== <span>a heading with [[link target]] in ity/span> ==\n should be linked",
],
[ [
false, // parseHeadings false, // parseHeadings
"With parseHeadings = false,\n== a heading with link target in it ==\n should not be linked", "With parseHeadings = false,\n== a heading with link target in it ==\n should not be linked",

12
tests/phpunit/SplitterTest.php
View File

@ -86,6 +86,18 @@ class SplitterTest extends MediaWikiTestCase {
"With parseHeadings = false,\n==a heading may not be linked==", "With parseHeadings = false,\n==a heading may not be linked==",
[ "With parseHeadings = false,\n", "==a heading may not be linked==", '' ] [ "With parseHeadings = false,\n", "==a heading may not be linked==", '' ]
], ],
[
true, // skipTemplates
true, // parseHeadings
"With parseHeadings = true,\n==<span>a heading with spans may be linked</span>==\n",
[ "With parseHeadings = true,\n==", "<span>", "a heading with spans may be linked", "</span>", "==\n" ]
],
[
true, // skipTemplates
true, // parseHeadings
"With parseHeadings = true,\n==<div>a heading with divs may be linked</div>==\n",
[ "With parseHeadings = true,\n==", "<div>", "a heading with divs may be linked", "</div>", "==\n" ]
],
// Improperly formatted headings cannot be dealt with appropriately for now // Improperly formatted headings cannot be dealt with appropriately for now
// [ // [
// true, // skipTemplates // true, // skipTemplates