Merged branch 'MDL-22232_easier_turn_off_notifications' from git://github.com/andyjdavis/moodle.git with conflict resolution

This commit is contained in:
Sam Hemelryk 2011-09-12 20:18:27 +12:00
commit 32ec60d142
7 changed files with 62 additions and 9 deletions

View file

@ -6709,8 +6709,16 @@ FROM
upgrade_main_savepoint(true, 2011090700.01);
}
if ($oldversion < 2011091200.00) {
//preference not required since 2.0
$DB->delete_records('user_preferences', array('name'=>'message_showmessagewindow'));
//re-introducing emailstop. check that its turned off so people dont suddenly stop getting notifications
$DB->set_field('user', 'emailstop', 0, array('emailstop' => 1));
upgrade_main_savepoint(true, 2011091200.00);
}
return true;
}
//TODO: AFTER 2.0 remove the column user->emailstop and the user preference "message_showmessagewindow"