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

install: MDL-19610 encapsulate empty($CFG->rolesactive) checks in a during_initial_install() function.

Browse Source
This commit is contained in:
tjhunt
2009-06-24 09:17:56 +00:00
parent 6847d4d824
commit 31a9987770
8 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+3 -3
View File
@@ -1260,7 +1260,7 @@ abstract class admin_setting {
// log change
$log = new object();
$log->userid = empty($CFG->rolesactive) ? 0 :$USER->id; // 0 as user id during install
$log->userid = during_initial_install() ? 0 :$USER->id; // 0 as user id during install
$log->timemodified = time();
$log->plugin = $this->plugin;
$log->name = $name;
@@ -3713,7 +3713,7 @@ class admin_setting_pickroles extends admin_setting_configmulticheckbox {
*/
public function load_choices() {
global $CFG, $DB;
if (empty($CFG->rolesactive)) {
if (during_initial_install()) {
return false;
}
if (is_array($this->choices)) {
@@ -3738,7 +3738,7 @@ class admin_setting_pickroles extends admin_setting_configmulticheckbox {
public function get_defaultsetting() {
global $CFG;
if (empty($CFG->rolesactive)) {
if (during_initial_install()) {
return null;
}
$result = array();