From: Chad Horohoe <demon@users.mediawiki.org>
Date: Sun, 12 Dec 2010 17:50:35 +0000 (+0000)
Subject: && not and, || not or
X-Git-Tag: 1.31.0-rc.0~33356
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=0a360ca59eae477d89815d134c5b3f65011bce60;p=lhc%2Fweb%2Fwiklou.git

&& not and, || not or
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 6ec0d2082c..d420116ca5 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -344,8 +344,8 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'newtalk', $newtalks );
 		$tpl->setRef( 'skin', $this );
 		$tpl->set( 'logo', $this->logoText() );
-		if ( $out->isArticle() and ( !isset( $oldid ) or isset( $diff ) ) and
-			$wgArticle and 0 != $wgArticle->getID() ){
+		if ( $out->isArticle() && ( !isset( $oldid ) || isset( $diff ) ) &&
+			$wgArticle && 0 != $wgArticle->getID() ){
 			if ( !$wgDisableCounters ) {
 				$viewcount = $wgLang->formatNum( $wgArticle->getCount() );
 				if ( $viewcount ) {