L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-13811 reworked unsetting of preferences and minor tweaks

Browse Source
This commit is contained in:
skodak
2008-07-05 22:46:31 +00:00
parent 4692da473f
commit 05c38e2b7c
4 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/editlib.php
+19 -5
View File
@@ -1,10 +1,24 @@
<?php //$Id$
function cancel_email_update($userid) {
unset_user_preference('newemail', $userid);
unset_user_preference('newemailkey', $userid);
unset_user_preference('newemailattemptsleft', $userid);
}
function useredit_load_preferences(&$user) {
if (!empty($user->id) and $preferences = get_user_preferences(null, null, $user->id)) {
foreach($preferences as $name=>$value) {
$user->{'preference_'.$name} = $value;
function useredit_load_preferences(&$user, $reload=true) {
global $USER;
if (!empty($user->id)) {
if ($reload and $USER->id == $user->id) {
// reload preferences in case it was changed in other session
unset($USER->preference);
}
if ($preferences = get_user_preferences(null, null, $user->id)) {
foreach($preferences as $name=>$value) {
$user->{'preference_'.$name} = $value;
}
}
}
}
@@ -62,7 +76,7 @@ function useredit_shared_definition(&$mform) {
global $CFG, $USER, $DB;
$user = $DB->get_record('user', array('id' => $USER->id));
useredit_load_preferences($user);
useredit_load_preferences($user, false);
$strrequired = get_string('required');