Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99044
Change subject: Fix an error in Page content unserialization
......................................................................
Fix an error in Page content unserialization
Change-Id: Ie728f1186785673c8849db02a8ada4bdcf448e5e
---
M includes/page/ProofreadPageContentHandler.php
M tests/includes/page/ProofreadPageContentHandlerTest.php
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/44/99044/1
diff --git a/includes/page/ProofreadPageContentHandler.php
b/includes/page/ProofreadPageContentHandler.php
index c6b16d1..dfcada4 100644
--- a/includes/page/ProofreadPageContentHandler.php
+++ b/includes/page/ProofreadPageContentHandler.php
@@ -63,7 +63,7 @@
$proofreader = '';
$level = 1;
- if ( preg_match(
'/^<noinclude>(.*?)\n\n\n<\/noinclude>(.*?)<noinclude>(.*?)<\/noinclude>$/s',
$text, $m ) ) {
+ if ( preg_match(
'/^<noinclude>(.*?)\n\n\n<\/noinclude>(.*)<noinclude>(.*?)<\/noinclude>$/s',
$text, $m ) ) {
$header = $m[1];
$body = $m[2];
$footer = $this->cleanTrailingDivTag( $m[3] );
diff --git a/tests/includes/page/ProofreadPageContentHandlerTest.php
b/tests/includes/page/ProofreadPageContentHandlerTest.php
index dd4b38d..099d3a7 100644
--- a/tests/includes/page/ProofreadPageContentHandlerTest.php
+++ b/tests/includes/page/ProofreadPageContentHandlerTest.php
@@ -22,6 +22,7 @@
array( 'Experimental header', 'Experimental body', '',
2, 'Woot', '<noinclude>{{PageQuality|2|Woot}}<div>Experimental header' .
"\n\n\n" . '</noinclude>Experimental body</div>'),
array( 'Experimental header', 'Experimental body',
'Experimental footer', 2, 'Woot', '<noinclude><pagequality level="2"
user="Woot" /><div class="pagetext">Experimental header' . "\n\n\n" .
'</noinclude>Experimental body<noinclude>Experimental footer</div></noinclude>'
),
array( 'Experimental header', 'Experimental body', '',
2, 'Woot', '<noinclude><pagequality level="2" user="Woot" /><div>Experimental
header' . "\n\n\n" . '</noinclude>Experimental body</div>' )
+ array( 'Experimental header', 'Experimental
<noinclude>body</noinclude>', 'Experimental footer', 2, 'Woot',
'<noinclude><pagequality level="2" user="Woot" /><div
class="pagetext">Experimental header' . "\n\n\n" . '</noinclude>Experimental
<noinclude>body</noinclude><noinclude>Experimental footer</div></noinclude>' ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/99044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie728f1186785673c8849db02a8ada4bdcf448e5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <thoma...@hotmail.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
