| Index: trunk/phase3/CREDITS |
| — | — | @@ -45,6 +45,7 @@ |
| 46 | 46 | * Jeremy Baron |
| 47 | 47 | * Juliano F. Ravasi |
| 48 | 48 | * Louperivois |
| | 49 | +* Marooned |
| 49 | 50 | * Matt Johnston |
| 50 | 51 | * Max Semenik |
| 51 | 52 | * Michael De La Rue |
| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -104,10 +104,10 @@ |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | function execute() { |
| 108 | | - global $wgUser, $wgOut; |
| | 108 | + global $wgUser, $wgOut, $wgTitle; |
| 109 | 109 | |
| 110 | 110 | if ( $wgUser->isAnon() ) { |
| 111 | | - $wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext' ); |
| | 111 | + $wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext', array($wgTitle->getPrefixedDBkey()) ); |
| 112 | 112 | return; |
| 113 | 113 | } |
| 114 | 114 | if ( wfReadOnly() ) { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1467,7 +1467,7 @@ |
| 1468 | 1468 | 'mypreferences' => 'My preferences', |
| 1469 | 1469 | 'prefs-edits' => 'Number of edits:', |
| 1470 | 1470 | 'prefsnologin' => 'Not logged in', |
| 1471 | | -'prefsnologintext' => 'You must be [[Special:UserLogin|logged in]] to set user preferences.', |
| | 1471 | +'prefsnologintext' => 'You must be <span class="plainlinks">[{{fullurl:Special:Userlogin|returnto=$1}} logged in]</span> to set user preferences.', |
| 1472 | 1472 | 'prefsreset' => 'Preferences have been reset from storage.', |
| 1473 | 1473 | 'qbsettings' => 'Quickbar', |
| 1474 | 1474 | 'qbsettings-none' => 'None', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -196,6 +196,7 @@ |
| 197 | 197 | * (bug 15497) Removed encoding attribute from <?xml ?> tag |
| 198 | 198 | * (bug 15544) Wiki not set up message (NoLocalSettings.php) now works for |
| 199 | 199 | non-index.php entry pages (e.g. api.php). Patch by Matt Johnston. |
| | 200 | +* (bug 12284) Special:Preferences now sets a returnto parameter on the link to Special:Userlogin. Patch by Marooned. |
| 200 | 201 | |
| 201 | 202 | |
| 202 | 203 | === API changes in 1.14 === |