| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -2670,6 +2670,11 @@ |
| 2671 | 2671 | $funcArgs = array_merge( array( &$this, trim( substr( $part1, $colonPos + 1 ) ) ), $funcArgs ); |
| 2672 | 2672 | $result = call_user_func_array( $this->mFunctionHooks[$function], $funcArgs ); |
| 2673 | 2673 | $found = true; |
| | 2674 | + |
| | 2675 | + // The text is usually already parsed, doesn't need triple-brace tags expanded, etc. |
| | 2676 | + $noargs = true; |
| | 2677 | + $noparse = true; |
| | 2678 | + |
| 2674 | 2679 | if ( is_array( $result ) ) { |
| 2675 | 2680 | $text = $linestart . $result[0]; |
| 2676 | 2681 | unset( $result[0] ); |
| — | — | @@ -2778,7 +2783,9 @@ |
| 2779 | 2784 | if ( $nowiki && $found && $this->mOutputType == OT_HTML ) { |
| 2780 | 2785 | $text = wfEscapeWikiText( $text ); |
| 2781 | 2786 | } elseif ( ($this->mOutputType == OT_HTML || $this->mOutputType == OT_WIKI) && $found ) { |
| 2782 | | - if ( !$noargs ) { |
| | 2787 | + if ( $noargs ) { |
| | 2788 | + $assocArgs = array(); |
| | 2789 | + } else { |
| 2783 | 2790 | # Clean up argument array |
| 2784 | 2791 | $assocArgs = array(); |
| 2785 | 2792 | $index = 1; |