r99071 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r99070‎ | r99071 | r99072 >
Date:01:23, 6 October 2011
Author:tstarling
Status:ok
Tags:
Comment:
MFT r99062: reintroduce recursive unstrip
Modified paths:
  • /branches/wmf/1.18wmf1/includes/parser/StripState.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/includes/parser/StripState.php
——@@ -90,10 +90,13 @@
9191
9292 wfProfileIn( __METHOD__ );
9393 $this->tempType = $type;
94 - $out = preg_replace_callback( $this->regex, array( $this, 'unstripCallback' ), $text );
 94+ do {
 95+ $oldText = $text;
 96+ $text = preg_replace_callback( $this->regex, array( $this, 'unstripCallback' ), $text );
 97+ } while ( $text !== $oldText );
9598 $this->tempType = null;
9699 wfProfileOut( __METHOD__ );
97 - return $out;
 100+ return $text;
98101 }
99102
100103 /**
Property changes on: branches/wmf/1.18wmf1/includes/parser/StripState.php
___________________________________________________________________
Added: svn:mergeinfo
101104 Merged /branches/sqlite/includes/parser/StripState.php:r58211-58321
102105 Merged /trunk/phase3/includes/parser/StripState.php:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656,99062
103106 Merged /branches/new-installer/phase3/includes/parser/StripState.php:r43664-66004
104107 Merged /branches/wmf-deployment/includes/parser/StripState.php:r53381
105108 Merged /branches/REL1_15/phase3/includes/parser/StripState.php:r51646

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r99062Fix for bug 31374: reintroduce recursive unstrip as in r27667, somehow omitte...tstarling00:07, 6 October 2011

Status & tagging log