Fix r95655 per Formfix's CR:

* use getCanonicalURL() - this part should be deployed to 1.17wmf1
* Do not show &oldid= in case of nonexisting pages, incl. file description pages from InstantCommons files

diff --git a/includes/Skin.php b/includes/Skin.php
index 10eba64..6b1365c 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -624,7 +624,12 @@ abstract class Skin extends ContextSource {
         */
        function printSource() {
                $oldid = $this->getRevisionId();
-               $url = htmlspecialchars( $this->getTitle()->getFullURL( 'oldid=' . $oldid ) );
+               if ( $oldid ) {
+                       $url = htmlspecialchars( $this->getTitle()->getCanonicalURL( 'oldid=' . $oldid ) );
+               } else {
+                       // oldid not available for non existing pages
+                       $url = htmlspecialchars( $this->getTitle()->getCanonicalURL() );
+               }
                return wfMsg( 'retrievedfrom', '<a href="' . $url . '">' . $url . '</a>' );
        }