From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 2 Sep 2005 05:04:25 +0000 (+0000)
Subject: * (bug 2841) Consistency in $this->loggedin use
X-Git-Tag: 1.6.0~1738
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=e3941aea2b025a5f5c37d5567ab129743ae56805;p=lhc%2Fweb%2Fwiklou.git

* (bug 2841) Consistency in $this->loggedin use
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 48aef1f4d6..d88aea79f3 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -650,7 +650,7 @@ class SkinTemplate extends Skin {
 			}
 			wfProfileOut( "$fname-live" );
 
-			if( $wgUser->isLoggedIn() and $action != 'submit' ) {
+			if( $this->loggedin and $action != 'submit' ) {
 				if( !$this->mTitle->userIsWatching()) {
 					$content_actions['watch'] = array(
 						'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
@@ -666,7 +666,7 @@ class SkinTemplate extends Skin {
 				}
 			}
 
-			if( $wgUser->isLoggedIn() || $wgValidationForAnons ) { # and $action != 'submit' ) {
+			if( $this->loggedin || $wgValidationForAnons ) { # and $action != 'submit' ) {
 				# Validate tab. TODO: add validation to logged-in user rights
 				if($wgUseValidation && ( $action == "" || $action=='view' ) ){ # && $wgUser->isAllowed('validate')){
 					if ( $oldid ) $oid = intval( $oldid ) ; # Use the oldid