r107900 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r107899‎ | r107900 | r107901 >
Date:17:08, 3 January 2012
Author:reedy
Status:ok
Tags:
Comment:
MFT r99062
Modified paths:
  • /branches/REL1_18/phase3 (modified) (history)
  • /branches/REL1_18/phase3/includes (modified) (history)
  • /branches/REL1_18/phase3/includes/parser/StripState.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/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/REL1_18/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
101104 Merged /trunk/phase3/includes:r99062
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
102105 Merged /trunk/phase3:r99062

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