[geeklog-cvs] geeklog: Don't display edit icon when the user doesn't have all ...

[geeklog-cvs at lists.geeklog.net]

changeset 8372:f3f40f4b3b49
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f3f40f4b3b49
user: Dirk Haun <dirk at haun-online.de>
date: Thu Jun 23 15:36:25 2011 +0200
description:
Don't display edit icon when the user doesn't have all the necessary rights and permissions (bug #0001210)

diffstat:

 system/lib-story.php |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (15 lines):

diff -r cff95c06a7ab -r f3f40f4b3b49 system/lib-story.php
--- a/system/lib-story.php	Thu Jun 23 15:11:20 2011 +0200
+++ b/system/lib-story.php	Thu Jun 23 15:36:25 2011 +0200
@@ -490,8 +490,9 @@
     $article->set_var( 'article_url', $articleUrl );
     $article->set_var( 'recent_post_anchortag', $recent_post_anchortag );
 
-    if( $story->checkAccess() == 3 AND SEC_hasrights( 'story.edit' ) AND ( $index != 'p' ))
-    {
+    if (($index != 'p') AND SEC_hasRights('story.edit') AND
+            ($story->checkAccess() == 3) AND
+            (SEC_hasTopicAccess($story->DisplayElements('tid')) == 3)) {
         $article->set_var( 'edit_link',
             COM_createLink($LANG01[4], $_CONF['site_admin_url']
                 . '/story.php?mode=edit&sid=' . $story->getSid())