| Index: branches/REL1_4/phase3/includes/Parser.php |
| — | — | @@ -2809,9 +2809,14 @@ |
| 2810 | 2810 | putenv( 'TZ='.$oldtzs ); |
| 2811 | 2811 | } |
| 2812 | 2812 | |
| | 2813 | + if( $user->getOption( 'fancysig' ) ) { |
| | 2814 | + $sigText = $k; |
| | 2815 | + } else { |
| | 2816 | + $sigText = '[[' . $wgContLang->getNsText( NS_USER ) . ":$n|$k]]"; |
| | 2817 | + } |
| 2813 | 2818 | $text = preg_replace( '/~~~~~/', $d, $text ); |
| 2814 | | - $text = preg_replace( '/~~~~/', '[[' . $wgContLang->getNsText( NS_USER ) . ":$n|$k]] $d", $text ); |
| 2815 | | - $text = preg_replace( '/~~~/', '[[' . $wgContLang->getNsText( NS_USER ) . ":$n|$k]]", $text ); |
| | 2819 | + $text = preg_replace( '/~~~~/', "$sigText $d", $text ); |
| | 2820 | + $text = preg_replace( '/~~~/', $sigText, $text ); |
| 2816 | 2821 | |
| 2817 | 2822 | # Context links: [[|name]] and [[name (context)|]] |
| 2818 | 2823 | # |
| Index: branches/REL1_4/phase3/includes/SpecialPreferences.php |
| — | — | @@ -414,8 +414,10 @@ |
| 415 | 415 | } |
| 416 | 416 | } |
| 417 | 417 | |
| | 418 | + $fancysig = $this->getToggle( 'fancysig' ); |
| 418 | 419 | $wgOut->addHTML(" |
| 419 | 420 | <div><label>$ynn: <input type='text' name=\"wpNick\" value=\"{$this->mNick}\" size='12' /></label></div> |
| | 421 | + <div>$fancysig<br /></div> |
| 420 | 422 | <div><label>$yl: <select name=\"wpUserLanguage\">\n"); |
| 421 | 423 | |
| 422 | 424 | /** |
| Index: branches/REL1_4/phase3/RELEASE-NOTES |
| — | — | @@ -156,7 +156,9 @@ |
| 157 | 157 | * Fix fatal errors in LanguageLi.php |
| 158 | 158 | * Undo overly bright, difficult to read colors in Cologne Blue |
| 159 | 159 | * (bug 1162) fix five-tilde date inserter |
| | 160 | +* Add raw signatures option for those who simply must have cute sigs |
| 160 | 161 | |
| | 162 | + |
| 161 | 163 | === Caveats === |
| 162 | 164 | |
| 163 | 165 | Some output, particularly involving user-supplied inline HTML, may not |
| Index: branches/REL1_4/phase3/languages/Language.php |
| — | — | @@ -58,7 +58,8 @@ |
| 59 | 59 | 'highlightbroken' => 1, 'stubthreshold' => 0, |
| 60 | 60 | 'previewontop' => 1, 'editsection'=>1,'editsectiononrightclick'=>0, 'showtoc'=>1, |
| 61 | 61 | 'showtoolbar' =>1, |
| 62 | | - 'date' => 0, 'imagesize' => 2 |
| | 62 | + 'date' => 0, 'imagesize' => 2, |
| | 63 | + 'fancysig' => 0, |
| 63 | 64 | ); |
| 64 | 65 | |
| 65 | 66 | /* private */ $wgQuickbarSettingsEn = array( |
| — | — | @@ -127,6 +128,7 @@ |
| 128 | 129 | 'previewontop', |
| 129 | 130 | 'previewonfirst', |
| 130 | 131 | 'nocache', |
| | 132 | + 'fancysig' |
| 131 | 133 | ); |
| 132 | 134 | |
| 133 | 135 | /* private */ $wgBookstoreListEn = array( |
| — | — | @@ -241,6 +243,7 @@ |
| 242 | 244 | 'tog-previewontop' => 'Show preview before edit box and not after it', |
| 243 | 245 | 'tog-previewonfirst' => 'Show preview on first edit', |
| 244 | 246 | 'tog-nocache' => 'Disable page caching', |
| | 247 | +'tog-fancysig' => 'Raw signatures (without automatic link)', |
| 245 | 248 | |
| 246 | 249 | # dates |
| 247 | 250 | 'sunday' => 'Sunday', |