mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski 2016-06-14 16:38:19 +01:00
commit b08523598b
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
blocks/myprofile/edit_form.php
View File

@ -57,13 +57,6 @@ class block_myprofile_edit_form extends block_edit_form {
$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);

4
blocks/myprofile/lang/en/block_myprofile.php
View File

@ -28,7 +28,6 @@ $string['display_picture'] = 'Display picture';
$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:addinstance'] = 'Add a new logged in user block';
$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';

1
blocks/myprofile/lang/en/deprecated.txt Normal file
View File

@ -0,0 +1 @@
display_un,block_myprofile