| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -887,10 +887,12 @@ |
| 888 | 888 | // A print stylesheet is attached to all pages, but nobody ever |
| 889 | 889 | // figures that out. :) Add a link... |
| 890 | 890 | if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) { |
| 891 | | - $nav_urls['print'] = array( |
| 892 | | - 'text' => wfMsg( 'printableversion' ), |
| 893 | | - 'href' => $wgRequest->appendQuery( 'printable=yes' ) |
| 894 | | - ); |
| | 891 | + if ( !$wgRequest->getBool( 'printable' ) ) { |
| | 892 | + $nav_urls['print'] = array( |
| | 893 | + 'text' => wfMsg( 'printableversion' ), |
| | 894 | + 'href' => $wgRequest->appendQuery( 'printable=yes' ) |
| | 895 | + ); |
| | 896 | + } |
| 895 | 897 | |
| 896 | 898 | // Also add a "permalink" while we're at it |
| 897 | 899 | if ( $this->mRevisionId ) { |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1073,9 +1073,13 @@ |
| 1074 | 1074 | function printableLink() { |
| 1075 | 1075 | global $wgOut, $wgFeedClasses, $wgRequest, $wgLang; |
| 1076 | 1076 | |
| 1077 | | - $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' ); |
| | 1077 | + $s = array(); |
| 1078 | 1078 | |
| 1079 | | - $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>'; |
| | 1079 | + if ( !$wgRequest->getBool( 'printable' ) ) { |
| | 1080 | + $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' ); |
| | 1081 | + $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>'; |
| | 1082 | + } |
| | 1083 | + |
| 1080 | 1084 | if( $wgOut->isSyndicated() ) { |
| 1081 | 1085 | foreach( $wgFeedClasses as $format => $class ) { |
| 1082 | 1086 | $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -220,6 +220,7 @@ |
| 221 | 221 | * (bug 19450) Use formatNum for "Number of edits" in Special:Preferences |
| 222 | 222 | * (bug 11242) Check for MySQL storage engines during installation now checks |
| 223 | 223 | whether the engines are actually available |
| | 224 | +* (bug 19390) Omit the "printable version" link on the printable version |
| 224 | 225 | |
| 225 | 226 | == API changes in 1.16 == |
| 226 | 227 | |