From 987c49b8c921d8541fc0472d382f7730b0e9fa5c Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Fri, 3 Jun 2011 05:42:04 +0000
Subject: [PATCH] issue 24 if lock comment, comment permission not allowed for
 admin

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8445 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.item.php   | 3 ++-
 modules/member/member.admin.view.php | 2 +-
 modules/member/member.model.php      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 82428d612..7b70cc5e2 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -690,7 +690,8 @@
          **/
         function isEnableComment() {
             // Return false if not authorized, if a secret document, if the document is set not to allow any comment
-            if(!$this->isGranted() && ( $this->isSecret() || $this->isLocked() || !$this->allowComment() ) ) return false;
+			// old version allowed admin(isGranted() method use), but admin not allow comment below condition
+            if( $this->isSecret() || $this->isLocked() || !$this->allowComment() ) return false;
 
             return true;
         }
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 512ceb520..00b34685d 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -234,4 +234,4 @@
             $this->setTemplateFile('delete_members');
         }
     }
-?>
\ No newline at end of file
+?>
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 96c87c8f0..ed085353f 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -698,4 +698,4 @@
         }
 
     }
-?>
\ No newline at end of file
+?>