| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -3133,14 +3133,6 @@ |
| 3134 | 3134 | function pstPass2( $text, &$user ) { |
| 3135 | 3135 | global $wgContLang, $wgLocaltimezone; |
| 3136 | 3136 | |
| 3137 | | - # Variable replacement |
| 3138 | | - # Because mOutputType is OT_WIKI, this will only process {{subst:xxx}} type tags |
| 3139 | | - $text = $this->replaceVariables( $text ); |
| 3140 | | - |
| 3141 | | - # Signatures |
| 3142 | | - # |
| 3143 | | - $sigText = $this->getUserSig( $user ); |
| 3144 | | - |
| 3145 | 3137 | /* Note: This is the timestamp saved as hardcoded wikitext to |
| 3146 | 3138 | * the database, we use $wgContLang here in order to give |
| 3147 | 3139 | * everyone the same signiture and use the default one rather |
| — | — | @@ -3156,10 +3148,16 @@ |
| 3157 | 3149 | putenv( 'TZ='.$oldtz ); |
| 3158 | 3150 | } |
| 3159 | 3151 | |
| | 3152 | + # Signatures |
| | 3153 | + $sigText = $this->getUserSig( $user ); |
| 3160 | 3154 | $text = preg_replace( '/~~~~~/', $d, $text ); |
| 3161 | 3155 | $text = preg_replace( '/~~~~/', "$sigText $d", $text ); |
| 3162 | 3156 | $text = preg_replace( '/~~~/', $sigText, $text ); |
| 3163 | 3157 | |
| | 3158 | + # Variable replacement |
| | 3159 | + # Because mOutputType is OT_WIKI, this will only process {{subst:xxx}} type tags |
| | 3160 | + $text = $this->replaceVariables( $text ); |
| | 3161 | + |
| 3164 | 3162 | # Context links: [[|name]] and [[name (context)|]] |
| 3165 | 3163 | # |
| 3166 | 3164 | global $wgLegalTitleChars; |
| Index: trunk/phase3/includes/SpecialPreferences.php |
| — | — | @@ -227,8 +227,14 @@ |
| 228 | 228 | $needRedirect = false; |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | | - # Clean up the signature a little |
| 232 | | - $this->mNick = Parser::cleanSig( $this->mNick ); |
| | 231 | + # Validate the signature and clean it up as needed |
| | 232 | + if( $this->mToggles['fancysig'] ) { |
| | 233 | + if( Parser::validateSig( $this->mNick ) ) { |
| | 234 | + $this->mNick = Parser::cleanSig( $this->mNick ); |
| | 235 | + } else { |
| | 236 | + $this->mainPrefsForm( 'error', wfMsg( 'badsig' ) ); |
| | 237 | + } |
| | 238 | + } |
| 233 | 239 | |
| 234 | 240 | $wgUser->setOption( 'language', $this->mUserLanguage ); |
| 235 | 241 | $wgUser->setOption( 'variant', $this->mUserVariant ); |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -13,7 +13,7 @@ |
| 14 | 14 | # See http://meta.wikipedia.org/wiki/MediaWiki_namespace |
| 15 | 15 | # |
| 16 | 16 | # NOTE TO TRANSLATORS: Do not copy this whole file when making translations! |
| 17 | | -# A lot of common constants and a base class with inheritable methods are |
| | 17 | +# A lot of common constants and a base class with inheritable mebathods are |
| 18 | 18 | # defined here, which should not be redefined. See the other LanguageXx.php |
| 19 | 19 | # files for examples. |
| 20 | 20 | # |
| — | — | @@ -631,7 +631,6 @@ |
| 632 | 632 | 'yourvariant' => 'Variant', |
| 633 | 633 | 'yournick' => 'Nickname:', |
| 634 | 634 | 'badsig' => 'Invalid raw signature; check HTML tags.', |
| 635 | | -'badsig2' => 'Your signature contains one or more reserved expressions; please remove them.', |
| 636 | 635 | 'email' => 'E-mail', |
| 637 | 636 | 'emailforlost' => '<div style="width:30em">* Optional. An e-mail lets others contact you on this site without revealing your address, and lets us send you a new password if you forget it.<br /><br />Your real name will be used to give you attribution for your work.</div>', |
| 638 | 637 | 'prefs-help-email-enotif' => 'This address is also used to send you e-mail notifications if you enabled the options.', |