| Index: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | 'group-autoreview-member' => 'autochecked users', |
| 44 | 44 | 'grouppage-autoreview' => '{{ns:project}}:Autochecked users', |
| 45 | 45 | 'revcontents-error' => 'Unable to get content.', |
| 46 | | - 'revcontents-getcontents' => '<a href="$1" >View this revision</a>', |
| | 46 | + 'revcontents-getcontents' => '[{{fullurl:$1|oldid=$2}} View this revision]', |
| 47 | 47 | 'revcontents-waiting' => 'Waiting for content', |
| 48 | 48 | 'revreview-hist-draft' => 'unchecked revision', |
| 49 | 49 | 'revreview-hist-pending' => 'pending revision', |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1827,12 +1827,11 @@ |
| 1828 | 1828 | * This will be replaced with artice content using javascript and an api call. |
| 1829 | 1829 | */ |
| 1830 | 1830 | public function addCustomHtml( OutputPage $out ) { |
| 1831 | | - global $wgTitle, $wgScript, $wgRequest; |
| | 1831 | + global $wgTitle; |
| 1832 | 1832 | $this->load(); |
| 1833 | | - if ( $wgRequest->getVal( 'oldid' ) ) { |
| 1834 | | - $oldId = $wgRequest->getVal( 'oldid' ); |
| 1835 | | - $oldRevisionUrl = $wgScript . '?title=' . $wgTitle . '&oldid=' . $oldId; |
| 1836 | | - $out->addHTML( "<div id='mw-fr-revisioncontents'>" . wfMsg( 'revcontents-getcontents', $oldRevisionUrl ) . "</div>" ); |
| | 1833 | + if ( $out->getRevisionId() ) { |
| | 1834 | + $oldRevisionLink = wfMsgExt( 'revcontents-getcontents', array( 'parseinline' ), $wgTitle, $out->getRevisionId() ); |
| | 1835 | + $out->addHTML( "<div id='mw-fr-revisioncontents' class='plainlinks'>" . $oldRevisionLink . "</div>" ); |
| 1837 | 1836 | } |
| 1838 | 1837 | |
| 1839 | 1838 | } |
| Property changes on: trunk/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1840 | 1839 | Merged /branches/chad-pre-wmf-merge/extensions/FlaggedRevs:r76925 |