&& not and, || not or

[lhc/web/wiklou.git] / includes / SkinTemplate.php

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 6ec0d20..d420116 100644 (file)
--- 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 ) {