Merge branch 'MDL-54622_m32v1' of https://github.com/sbourget/moodle

pbhwheeler · Jun 16, 2016 · b085235 · b085235
2 parents 62bc2e8 + db5ab8f
commit b085235
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/blocks/myprofile/edit_form.php b/blocks/myprofile/edit_form.php
@@ -57,13 +57,6 @@ protected function specific_definition($mform) {
             $mform->setDefault('config_display_email', '1');
         }
 
-        $mform->addElement('selectyesno', 'config_display_un', get_string('display_un', 'block_myprofile'));
-        if (isset($this->block->config->display_un)) {
-            $mform->setDefault('config_display_un', $this->block->config->display_un);
-        } else {
-            $mform->setDefault('config_display_un', '0');
-        }
-
         $mform->addElement('selectyesno', 'config_display_icq', get_string('display_icq', 'block_myprofile'));
         if (isset($this->block->config->display_icq)) {
             $mform->setDefault('config_display_icq', $this->block->config->display_icq);

diff --git a/blocks/myprofile/lang/en/block_myprofile.php b/blocks/myprofile/lang/en/block_myprofile.php
@@ -28,7 +28,6 @@
 $string['display_country'] = 'Display country';
 $string['display_city'] = 'Display city';
 $string['display_email'] = 'Display email';
-$string['display_un'] = 'Display name';
 $string['display_icq'] = 'Display ICQ';
 $string['display_skype'] = 'Display Skype';
 $string['display_yahoo'] = 'Display Yahoo';
@@ -46,3 +45,6 @@
 $string['myprofile:myaddinstance'] = 'Add a new logged in user block to Dashboard';
 $string['myprofile_settings'] = 'Visible user information';
 $string['pluginname'] = 'Logged in user';
+
+// Deprecated since Moodle 3.2.
+$string['display_un'] = 'Display name';
diff --git a/blocks/myprofile/lang/en/deprecated.txt b/blocks/myprofile/lang/en/deprecated.txt
@@ -0,0 +1 @@
+display_un,block_myprofile