From: Brion Vibber Date: Wed, 28 Mar 2007 15:12:05 +0000 (+0000) Subject: Revert r20659: accesses private member variables of Article and Revision, and doesn... X-Git-Tag: 1.31.0-rc.0~53564 X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=41c0080abcf0f92ae243bf40637a18c1af4ab777;p=lhc%2Fweb%2Fwiklou.git Revert r20659: accesses private member variables of Article and Revision, and doesn't appear to actually fix the permalink-on-old-version issue to boot --- diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 05eda0c9de..9643b1736e 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -845,9 +845,9 @@ class SkinTemplate extends Skin { 'text' => wfMsg( 'permalink' ), 'href' => '' ); - } else if( $wgArticle ) { - $revid = ($wgArticle->mRevision) ? $wgArticle->mRevision->mId : $wgArticle->getLatest(); - if ( $revid ) + } else { + $revid = $wgArticle ? $wgArticle->getLatest() : 0; + if ( !( $revid == 0 ) ) $nav_urls['permalink'] = array( 'text' => wfMsg( 'permalink' ), 'href' => $wgTitle->getLocalURL( "oldid=$revid" )