| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -719,7 +719,7 @@ |
| 720 | 720 | $args = func_get_args(); |
| 721 | 721 | array_shift( $args ); |
| 722 | 722 | return wfMsgReplaceArgs( |
| 723 | | - MessageCache::singleton()->parse( wfMsgGetKey( $key, true ), null, /* can't be set to false */ true ), |
| | 723 | + MessageCache::singleton()->parse( wfMsgGetKey( $key, true ), null, /* can't be set to false */ true )->getText(), |
| 724 | 724 | $args ); |
| 725 | 725 | } |
| 726 | 726 | |
| — | — | @@ -742,8 +742,6 @@ |
| 743 | 743 | * Behavior for conflicting options (e.g., parse+parseinline) is undefined. |
| 744 | 744 | */ |
| 745 | 745 | function wfMsgExt( $key, $options ) { |
| 746 | | - global $wgMessageCache; |
| 747 | | - |
| 748 | 746 | $args = func_get_args(); |
| 749 | 747 | array_shift( $args ); |
| 750 | 748 | array_shift( $args ); |
| — | — | @@ -783,9 +781,9 @@ |
| 784 | 782 | |
| 785 | 783 | $messageCache = MessageCache::singleton(); |
| 786 | 784 | if( in_array( 'parse', $options, true ) ) { |
| 787 | | - $string = $messageCache->parse( $string, null, true, !$forContent, $langCodeObj ); |
| | 785 | + $string = $messageCache->parse( $string, null, true, !$forContent, $langCodeObj )->getText(); |
| 788 | 786 | } elseif ( in_array( 'parseinline', $options, true ) ) { |
| 789 | | - $string = $messageCache->parse( $string, null, true, !$forContent, $langCodeObj ); |
| | 787 | + $string = $messageCache->parse( $string, null, true, !$forContent, $langCodeObj )->getText(); |
| 790 | 788 | $m = array(); |
| 791 | 789 | if( preg_match( '/^<p>(.*)\n?<\/p>\n?$/sU', $string, $m ) ) { |
| 792 | 790 | $string = $m[1]; |
| Index: trunk/phase3/includes/Message.php |
| — | — | @@ -432,7 +432,7 @@ |
| 433 | 433 | * @return string Wikitext parsed into HTML |
| 434 | 434 | */ |
| 435 | 435 | protected function parseText( $string ) { |
| 436 | | - return MessageCache::singleton()->parse( $string, /*linestart*/true, $this->interface, $this->language ); |
| | 436 | + return MessageCache::singleton()->parse( $string, null, /*linestart*/true, $this->interface, $this->language )->getText(); |
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | /** |