← Back to branch summary

~ubuntu-branches/ubuntu/trusty/moodle/trusty

« back to all changes in this revision

Viewing changes to message/edit.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2014-01-21 13:40:52 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20140121134052-ym2qvsp2cd9vq0p6
Tags: 2.5.4-1
http://bugs.debian.org/735312
* New upstream release, fixing security issues:
  - MSA-14-0001 Config passwords visibility issue [CVE-2014-0008]
  - MSA-14-0002 Group constraints lacking in "login as" [CVE-2014-0009]
  - MSA-14-0003 CSRF vulnerability in profile fields [CVE-2014-0010]
* Move /var/lib/moodle directory into package.
* Revert back to bundled yui3. Unfortunately, version in Debian and
  of upstream are not compatible (closes: #735312).

Show diffs side-by-side

added added

removed removed

Lines of Context:
message/edit.php
117
117
 
118
118
    //process general messaging preferences
119
119
    $preferences['message_blocknoncontacts'] = !empty($form->blocknoncontacts)?1:0;
120
 
    //$preferences['message_beepnewmessage']    = !empty($form->beepnewmessage)?1:0;
 
120
    $preferences['message_beepnewmessage']   = !empty($form->beepnewmessage)?1:0;
121
121
 
122
122
    // Save all the new preferences to the database
123
123
    if (!set_user_preferences($preferences, $user->id)) {
155
155
 
156
156
//load general messaging preferences
157
157
$preferences->blocknoncontacts  =  get_user_preferences( 'message_blocknoncontacts', '', $user->id);
158
 
//$preferences->beepnewmessage    =  get_user_preferences( 'message_beepnewmessage', '', $user->id);
 
158
$preferences->beepnewmessage    =  get_user_preferences( 'message_beepnewmessage', '', $user->id);
159
159
 
160
160
/// Display page header
161
161
$strmessaging = get_string('messaging', 'message');