r51724 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r51723‎ | r51724 | r51725 >
Date:03:05, 11 June 2009
Author:yaron
Status:ok
Tags:
Comment:
Fixed most of the calls to killMarkers()
Modified paths:
  • /trunk/extensions/ParserFunctions/ParserFunctions_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ParserFunctions/ParserFunctions_body.php
@@ -562,8 +562,8 @@
563563 function runPos ( &$parser, $inStr = '', $inNeedle = '', $inOffset = 0 ) {
564564 wfProfileIn( __METHOD__ );
565565
566 - $inStr = $this->killMarkers( (string)$inStr );
567 - $inNeedle = $this->killMarkers( (string)$inNeedle );
 566+ $inStr = $this->killMarkers( $parser, (string)$inStr );
 567+ $inNeedle = $this->killMarkers( $parser, (string)$inNeedle );
568568
569569 if( !$this->checkLength( $inStr ) ||
570570 !$this->checkLength( $inNeedle ) ) {
@@ -591,8 +591,8 @@
592592 function runRPos ( &$parser, $inStr = '', $inNeedle = '' ) {
593593 wfProfileIn( __METHOD__ );
594594
595 - $inStr = $this->killMarkers( (string)$inStr );
596 - $inNeedle = $this->killMarkers( (string)$inNeedle );
 595+ $inStr = $this->killMarkers( $parser, (string)$inStr );
 596+ $inNeedle = $this->killMarkers( $parser, (string)$inNeedle );
597597
598598 if( !$this->checkLength( $inStr ) ||
599599 !$this->checkLength( $inNeedle ) ) {
@@ -624,7 +624,7 @@
625625 function runSub ( &$parser, $inStr = '', $inStart = 0, $inLength = 0 ) {
626626 wfProfileIn( __METHOD__ );
627627
628 - $inStr = $this->killMarkers( (string)$inStr );
 628+ $inStr = $this->killMarkers( $parser, (string)$inStr );
629629
630630 if( !$this->checkLength( $inStr ) ) {
631631 wfProfileOut( __METHOD__ );
@@ -651,8 +651,8 @@
652652 function runCount ( &$parser, $inStr = '', $inSubStr = '' ) {
653653 wfProfileIn( __METHOD__ );
654654
655 - $inStr = $this->killMarkers( (string)$inStr );
656 - $inSubStr = $this->killMarkers( (string)$inSubStr );
 655+ $inStr = $this->killMarkers( $parser, (string)$inStr );
 656+ $inSubStr = $this->killMarkers( $parser, (string)$inSubStr );
657657
658658 if( !$this->checkLength( $inStr ) ||
659659 !$this->checkLength( $inSubStr ) ) {
@@ -682,9 +682,9 @@
683683 global $wgPFStringLengthLimit;
684684 wfProfileIn( __METHOD__ );
685685
686 - $inStr = $this->killMarkers( (string)$inStr );
687 - $inReplaceFrom = $this->killMarkers( (string)$inReplaceFrom );
688 - $inReplaceTo = $this->killMarkers( (string)$inReplaceTo );
 686+ $inStr = $this->killMarkers( $parser, (string)$inStr );
 687+ $inReplaceFrom = $this->killMarkers( $parser, (string)$inReplaceFrom );
 688+ $inReplaceTo = $this->killMarkers( $parser, (string)$inReplaceTo );
689689
690690 if( !$this->checkLength( $inStr ) ||
691691 !$this->checkLength( $inReplaceFrom ) ||
@@ -738,8 +738,8 @@
739739 function runExplode ( &$parser, $inStr = '', $inDiv = '', $inPos = 0 ) {
740740 wfProfileIn( __METHOD__ );
741741
742 - $inStr = $this->killMarkers( (string)$inStr );
743 - $inDiv = $this->killMarkers( (string)$inDiv );
 742+ $inStr = $this->killMarkers( $parser, (string)$inStr );
 743+ $inDiv = $this->killMarkers( $parser, (string)$inDiv );
744744
745745 if( $inDiv == '' ) { $inDiv = ' '; }
746746

Status & tagging log