From: toyomoyo Date: Wed, 31 May 2006 07:12:10 +0000 (+0000) Subject: merged, changepassword obsolete X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6dede909af5039e8ceba84c5804d864157e55ef7;p=moodle.git merged, changepassword obsolete --- diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php index b3739f7665..35c7d5c0d5 100644 --- a/blocks/admin/block_admin.php +++ b/blocks/admin/block_admin.php @@ -226,10 +226,8 @@ class block_admin extends block_list { if (is_internal_auth() && !is_restricted_user($USER->username)) { $this->content->items[]=''.get_string('changepassword').''; $this->content->icons[]=''; - } else if ($CFG->changepassword && !is_restricted_user($USER->username)) { - $this->content->items[]=''.get_string('changepassword').''; - $this->content->icons[]=''; - } + } + if ($CFG->allowunenroll && !$course->metacourse) { $this->content->items[]=''.get_string('unenrolme', '', $course->shortname).''; $this->content->icons[]='';