Merge branch 'MDL-59436-master' of git://github.com/junpataleta/moodle

2017-07-24 16:55:54 +01:00
parent 9c631e9408 f7cd3bc0e1
commit e3f17b9fdb
3 changed files with 9 additions and 23 deletions
@@ -189,6 +189,8 @@ if ($hassiteconfig
                    'phone2'      => new lang_string('phone2'),
                    'department'  => new lang_string('department'),
                    'institution' => new lang_string('institution'),
+                    'city'        => new lang_string('city'),
+                    'country'     => new lang_string('country'),
                )));
        $setting = new admin_setting_configtext('fullnamedisplay', new lang_string('fullnamedisplay', 'admin'),
            new lang_string('configfullnamedisplay', 'admin'), 'language', PARAM_TEXT, 50);