Index: trunk/phase3/includes/SpecialWatchlist.php |
— | — | @@ -199,9 +199,13 @@ |
200 | 200 | ); |
201 | 201 | } else { |
202 | 202 | global $wgContLang; |
| 203 | + $toolLinks = array(); |
203 | 204 | $titleText = $titleObj->getPrefixedText(); |
204 | 205 | $pageLink = $sk->makeLinkObj( $titleObj ); |
205 | | - $talkLink = $sk->makeLinkObj( $titleObj->getTalkPage(), $wgLang->getNsText( NS_TALK ) ); |
| 206 | + $toolLinks[] = $sk->makeLinkObj( $titleObj->getTalkPage(), $wgLang->getNsText( NS_TALK ) ); |
| 207 | + if( $titleObj->exists() ) |
| 208 | + $toolLinks[] = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml( 'history_short' ), 'action=history' ); |
| 209 | + $toolLinks = '(' . implode( ' | ', $toolLinks ) . ')'; |
206 | 210 | $checkbox = '<input type="checkbox" name="id[]" value="' . htmlspecialchars( $titleObj->getPrefixedText() ) . '" /> ' . ( $wgContLang->isRTL() ? '‏' : '‎' ); |
207 | 211 | if( $redir ) { |
208 | 212 | $spanopen = '<span class="watchlistredir">'; |
— | — | @@ -210,7 +214,7 @@ |
211 | 215 | $spanopen = $spanclosed = ''; |
212 | 216 | } |
213 | 217 | |
214 | | - $wgOut->addHTML( "<li>{$checkbox}{$spanopen}{$pageLink}{$spanclosed} ({$talkLink})</li>\n" ); |
| 218 | + $wgOut->addHTML( "<li>{$checkbox}{$spanopen}{$pageLink}{$spanclosed} {$toolLinks}</li>\n" ); |
215 | 219 | } |
216 | 220 | } |
217 | 221 | $wgOut->addHTML( '</ul>' ); |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -18,40 +18,16 @@ |
19 | 19 | Those wishing to use the latest code instead of a branch release can obtain |
20 | 20 | it from source control: http://www.mediawiki.org/wiki/Download_from_SVN |
21 | 21 | |
| 22 | +== Changes since 1.6 == |
22 | 23 | |
23 | | -=== What's new in 1.6 === |
| 24 | +* (bug 5458) Fix double-URL encoding in block log link in contribs and contribs |
| 25 | + link in block log |
| 26 | +* (bug 5462) Bogus missing patch warning in updater |
| 27 | +* (bug 5461) Use of deprecated "showhideminor" in Special:Recentchangeslinked |
| 28 | +* PHP warning when allow_call_time_pass_reference is off |
| 29 | +* Update to Finnish localization |
| 30 | +* (bug 5467) Link to page histories in watchlist edit mode |
24 | 31 | |
25 | | -User interface: |
26 | | -* The account creation form has been separated from the user login form. |
27 | | -* Page protection/unprotection uses a new, expanded form |
28 | | - |
29 | | -Templates: |
30 | | -* Categories and "what links here" now update as expected when adding or |
31 | | - removing links in a template. |
32 | | -* Template parameters can now have default values, as {{{name|default value}}} |
33 | | - |
34 | | -Uploads: |
35 | | -* Optional support for rasterizing SVG images to PNG for inline dislay |
36 | | - |
37 | | -Feeds: |
38 | | -* Feed generation upgraded to Atom 1.0 |
39 | | -* Diffs in RSS and Atom feeds are now colored for improved readability. |
40 | | - |
41 | | -Database: |
42 | | -* MySQL 3.23.x support dropped; 4.0 or later required |
43 | | -* Experimental support for Unicode mode of MySQL 4.1/5.0 (moderately tested) |
44 | | -* Experimental Oracle support (not well tested!) |
45 | | - |
46 | | -Anti-spam extension support: |
47 | | -* Spam blacklist extension now has support for automated cleanup: |
48 | | - http://meta.wikimedia.org/wiki/SpamBlacklist_extension |
49 | | -* Support for a captcha extension to restrict automated spam edits: |
50 | | - http://meta.wikimedia.org/wiki/ConfirmEdit_extension |
51 | | - |
52 | | -Numerous bug fixes and other behind-the-scenes changes have been made; |
53 | | -see the file HISTORY for a complete change list. |
54 | | - |
55 | | - |
56 | 32 | == Compatibility == |
57 | 33 | |
58 | 34 | Older PHP 4.2 and 4.1 releases are no longer supported; PHP 4 users must |