Merge branch 'w13_MDL-26951_20_archetypes' of git://github.com/skodak/moodle into MOODLE_20_STABLE

2011-03-28 19:40:35 +02:00
parent faa297ce6f c102060deb
commit c44c552efa
1 changed files with 1 additions and 2 deletions
@@ -628,7 +628,7 @@ class define_role_table_advanced extends capability_table_with_risks {

        // Legacy type.
        $archetype = optional_param('archetype', null, PARAM_RAW);
-        if ($archetype) {
+        if (isset($archetype)) {
            $archetypes = get_role_archetypes();
            if (isset($archetypes[$archetype])){
                $this->role->archetype = $archetype;
@@ -716,7 +716,6 @@ class define_role_table_advanced extends capability_table_with_risks {
    }

    protected function get_archetype_field($id) {
-        global $OUTPUT;
        $options = array();
        $options[''] = get_string('none');
        foreach(get_role_archetypes() as $type) {