| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -89,10 +89,20 @@ |
| 90 | 90 | const MARKER_SUFFIX = "-QINU\x7f"; |
| 91 | 91 | |
| 92 | 92 | # Persistent: |
| 93 | | - var $mTagHooks, $mTransparentTagHooks, $mFunctionHooks, $mFunctionSynonyms, $mVariables; |
| 94 | | - var $mSubstWords, $mImageParams, $mImageParamsMagicArray, $mStripList, $mMarkerIndex; |
| 95 | | - var $mPreprocessor, $mExtLinkBracketedRegex, $mUrlProtocols, $mDefaultStripList; |
| 96 | | - var $mVarCache, $mConf, $mFunctionTagHooks; |
| | 93 | + var $mTagHooks = array(); |
| | 94 | + var $mTransparentTagHooks = array(); |
| | 95 | + var $mFunctionHooks = array(); |
| | 96 | + var $mFunctionSynonyms = array( 0 => array(), 1 => array() ); |
| | 97 | + var $mFunctionTagHooks = array(); |
| | 98 | + var $mStripList = array(); |
| | 99 | + var $mDefaultStripList = array(); |
| | 100 | + var $mVarCache = array(); |
| | 101 | + var $mImageParams = array(); |
| | 102 | + var $mImageParamsMagicArray = array(); |
| | 103 | + var $mMarkerIndex = 0; |
| | 104 | + var $mFirstCall = true; |
| | 105 | + var $mVariables, $mSubstWords; # Initialised by initialiseVariables() |
| | 106 | + var $mConf, $mPreprocessor, $mExtLinkBracketedRegex, $mUrlProtocols; # Initialised in constructor |
| 97 | 107 | |
| 98 | 108 | |
| 99 | 109 | # Cleared with clearState(): |
| — | — | @@ -124,16 +134,9 @@ |
| 125 | 135 | */ |
| 126 | 136 | function __construct( $conf = array() ) { |
| 127 | 137 | $this->mConf = $conf; |
| 128 | | - $this->mTagHooks = array(); |
| 129 | | - $this->mTransparentTagHooks = array(); |
| 130 | | - $this->mFunctionHooks = array(); |
| 131 | | - $this->mFunctionTagHooks = array(); |
| 132 | | - $this->mFunctionSynonyms = array( 0 => array(), 1 => array() ); |
| 133 | | - $this->mDefaultStripList = $this->mStripList = array(); |
| 134 | 138 | $this->mUrlProtocols = wfUrlProtocols(); |
| 135 | 139 | $this->mExtLinkBracketedRegex = '/\[(\b(' . wfUrlProtocols() . ')'. |
| 136 | 140 | '[^][<>"\\x00-\\x20\\x7F]+) *([^\]\\x00-\\x08\\x0a-\\x1F]*?)\]/S'; |
| 137 | | - $this->mVarCache = array(); |
| 138 | 141 | if ( isset( $conf['preprocessorClass'] ) ) { |
| 139 | 142 | $this->mPreprocessorClass = $conf['preprocessorClass']; |
| 140 | 143 | } elseif ( extension_loaded( 'domxml' ) ) { |
| — | — | @@ -145,8 +148,6 @@ |
| 146 | 149 | } else { |
| 147 | 150 | $this->mPreprocessorClass = 'Preprocessor_Hash'; |
| 148 | 151 | } |
| 149 | | - $this->mMarkerIndex = 0; |
| 150 | | - $this->mFirstCall = true; |
| 151 | 152 | } |
| 152 | 153 | |
| 153 | 154 | /** |