From: skodak <skodak>
Date: Tue, 21 Nov 2006 20:36:06 +0000 (+0000)
Subject: Social activities block always appears in edit mode to admin without turning editing... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6fdfb3478c6fcc47fa69a9dccc7269945368d491;p=moodle.git

Social activities block always appears in edit mode to admin without turning editing on MDL-7639; merged from MOODLE_17_STABLE
---

diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index c18d451796..6bb508b7cb 100644
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -38,7 +38,7 @@ class block_social_activities extends block_list {
         $groupbuttons = $course->groupmode;
         $groupbuttonslink = (!$course->groupmodeforce);
         $viewhiddenactivities = has_capability('moodle/course:viewhiddenactivities', $context);
-        $manageactivities = has_capability('moodle/course:manageactivities', $context);
+        $isediting = isediting($this->instance->pageid);
         $ismoving = ismoving($this->instance->pageid);
         if ($ismoving) {
             $strmovehere = get_string('movehere');
@@ -62,7 +62,7 @@ class block_social_activities extends block_list {
                     continue;
                 }
                 $mod = $mods[$modnumber];
-                if ($manageactivities && !$ismoving) {
+                if ($isediting && !$ismoving) {
                     if ($groupbuttons) {
                         if (! $mod->groupmodelink = $groupbuttonslink) {
                             $mod->groupmode = $course->groupmode;
@@ -116,7 +116,7 @@ class block_social_activities extends block_list {
             $this->content->icons[] = '';
         }
 
-        if ($manageactivities && $modnames) {
+        if ($isediting && $modnames) {
             $this->content->footer = print_section_add_menus($course, 0, $modnames, true, true);
         } else {
             $this->content->footer = '';