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

Merge branch 'MDL-54734-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2016-07-07 09:58:32 +08:00
parent 27273dab58 1e8bbc6040
commit 119412b0ca
2 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/user.php
+19 -17
View File
@@ -152,14 +152,15 @@ class core_user {
// If noreply user is set then use it, else create one.
if (!empty($CFG->noreplyuserid)) {
self::$noreplyuser = self::get_user($CFG->noreplyuserid);
self::$noreplyuser->emailstop = 1; // Force msg stop for this user.
return self::$noreplyuser;
} else {
// Do not cache the dummy user record to avoid language internationalization issues.
$noreplyuser = self::get_dummy_user_record();
$noreplyuser->maildisplay = '1'; // Show to all.
$noreplyuser->emailstop = 1;
return $noreplyuser;
}
if (empty(self::$noreplyuser)) {
self::$noreplyuser = self::get_dummy_user_record();
self::$noreplyuser->maildisplay = '1'; // Show to all.
}
self::$noreplyuser->emailstop = 1; // Force msg stop for this user.
return self::$noreplyuser;
}
/**
@@ -182,18 +183,19 @@ class core_user {
// If custom support user is set then use it, else if supportemail is set then use it, else use noreply.
if (!empty($CFG->supportuserid)) {
self::$supportuser = self::get_user($CFG->supportuserid, '*', MUST_EXIST);
}
// Try sending it to support email if support user is not set.
if (empty(self::$supportuser) && !empty($CFG->supportemail)) {
self::$supportuser = self::get_dummy_user_record();
self::$supportuser->id = self::SUPPORT_USER;
self::$supportuser->email = $CFG->supportemail;
} else if (empty(self::$supportuser) && !empty($CFG->supportemail)) {
// Try sending it to support email if support user is not set.
$supportuser = self::get_dummy_user_record();
$supportuser->id = self::SUPPORT_USER;
$supportuser->email = $CFG->supportemail;
if ($CFG->supportname) {
self::$supportuser->firstname = $CFG->supportname;
$supportuser->firstname = $CFG->supportname;
}
self::$supportuser->username = 'support';
self::$supportuser->maildisplay = '1'; // Show to all.
$supportuser->username = 'support';
$supportuser->maildisplay = '1'; // Show to all.
// Unset emailstop to make sure support message is sent.
$supportuser->emailstop = 0;
return $supportuser;
}
// Send support msg to admin user if nothing is set above.
lib/tests/user_test.php
+23
View File
@@ -209,4 +209,27 @@ class core_user_testcase extends advanced_testcase {
$this->assertRegExp('/Invalid property requested./', $e->getMessage());
}
}
/**
* Ensure that the noreply user is not cached.
*/
public function test_get_noreply_user() {
global $CFG;
// Create a new fake language 'xx' with the 'noreplyname'.
$langfolder = $CFG->dataroot . '/lang/xx';
check_dir_exists($langfolder);
$langconfig = "<?php\n\defined('MOODLE_INTERNAL') || die();";
file_put_contents($langfolder . '/langconfig.php', $langconfig);
$langconfig = "<?php\n\$string['noreplyname'] = 'XXX';";
file_put_contents($langfolder . '/moodle.php', $langconfig);
$CFG->lang='en';
$enuser = \core_user::get_noreply_user();
$CFG->lang='xx';
$xxuser = \core_user::get_noreply_user();
$this->assertNotEquals($enuser, $xxuser);
}
}