From f2770bfe1a92d2faaeacb0b40f311b2703dd5541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Mon, 15 Apr 2013 13:21:39 +0200
Subject: [PATCH] MDL-39132 always include badge settings, hide the pages when
 disabled

---
 admin/settings/badges.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/settings/badges.php b/admin/settings/badges.php
index 7e6f41e1096..a4774ff46cc 100644
--- a/admin/settings/badges.php
+++ b/admin/settings/badges.php
@@ -27,7 +27,7 @@
 
 global $SITE;
 
-if (!empty($CFG->enablebadges) && ($hassiteconfig || has_any_capability(array(
+if (($hassiteconfig || has_any_capability(array(
             'moodle/badges:viewawarded',
             'moodle/badges:createbadge',
             'moodle/badges:manageglobalsettings',
@@ -39,7 +39,7 @@ if (!empty($CFG->enablebadges) && ($hassiteconfig || has_any_capability(array(
     require_once($CFG->libdir . '/badgeslib.php');
 
     $globalsettings = new admin_settingpage('badgesettings', new lang_string('badgesettings', 'badges'),
-            array('moodle/badges:manageglobalsettings'));
+            array('moodle/badges:manageglobalsettings'), empty($CFG->enablebadges));
 
     $globalsettings->add(new admin_setting_configtext('badges_defaultissuername',
             new lang_string('defaultissuername', 'badges'),
@@ -69,16 +69,16 @@ if (!empty($CFG->enablebadges) && ($hassiteconfig || has_any_capability(array(
     $ADMIN->add('badges',
         new admin_externalpage('managebadges',
             new lang_string('managebadges', 'badges'),
-            new moodle_url($CFG->wwwroot . '/badges/index.php', array('type' => BADGE_TYPE_SITE)),
-            array('moodle/badges:viewawarded')
+            new moodle_url('/badges/index.php', array('type' => BADGE_TYPE_SITE)),
+            array('moodle/badges:viewawarded'), empty($CFG->enablebadges)
         )
     );
 
     $ADMIN->add('badges',
         new admin_externalpage('newbadge',
             new lang_string('newbadge', 'badges'),
-            new moodle_url($CFG->wwwroot . '/badges/newbadge.php', array('type' => BADGE_TYPE_SITE)),
-            array('moodle/badges:createbadge')
+            new moodle_url('/badges/newbadge.php', array('type' => BADGE_TYPE_SITE)),
+            array('moodle/badges:createbadge'), empty($CFG->enablebadges)
         )
     );
 }