Skip to content

Commit

Permalink
Merge branch 'MDL-33374-m23' of git://github.com/ankitagarwal/moodle …
Browse files Browse the repository at this point in the history
…into MOODLE_23_STABLE
  • Loading branch information
Sam Hemelryk committed Sep 10, 2012
2 parents 5a05aa9 + 800abd6 commit 1595c97
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions lang/en/moodle.php
Expand Up @@ -363,6 +363,7 @@
$string['createcategory'] = 'Create category';
$string['createfolder'] = 'Create a folder in {$a}';
$string['createuserandpass'] = 'Choose your username and password';
$string['createuser'] = 'Create user';
$string['createziparchive'] = 'Create zip archive';
$string['creatingblocks'] = 'Creating blocks';
$string['creatingblocksroles'] = 'Creating block level role assignments and overrides';
Expand Down
8 changes: 7 additions & 1 deletion user/editadvanced_form.php
Expand Up @@ -72,7 +72,13 @@ function definition() {
/// Next the customisable profile fields
profile_definition($mform, $userid);

$this->add_action_buttons(false, get_string('updatemyprofile'));
if ($userid == -1) {
$btnstring = get_string('createuser');
} else {
$btnstring = get_string('updatemyprofile');
}

$this->add_action_buttons(false, $btnstring);
}

function definition_after_data() {
Expand Down

0 comments on commit 1595c97

Please sign in to comment.