lib/db/upgrade: MDL-21664 - $CFG->passwordmainsalt was used rather than $CFG->passwordsaltmain

Causing all admins to be warned about their salt even if they had one set
This commit is contained in:
Dan Poltawski
2010-02-19 16:47:28 +00:00
parent 5bc3ab3db0
commit ff9a1e85c9
2 changed files with 36 additions and 2 deletions
+34
View File
@@ -188,10 +188,44 @@ $moodle_capabilities = array(
'legacy' => array(
'editingteacher' => CAP_ALLOW,
'admin' => CAP_ALLOW
<<<<<<< access.php
),
'clonepermissionsfrom' => 'moodle/site:restore'
),
<<<<<<< access.php
'moodle/backup:userinfo' => array(
'riskbitmask' => RISK_PERSONAL | RISK_CONFIG,
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
'admin' => CAP_ALLOW
)
),
=======
'moodle/backup:userinfo' => array(
'riskbitmask' => RISK_PERSONAL,
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
'admin' => CAP_ALLOW
=======
>>>>>>> 1.75.2.23
)
),
<<<<<<< access.php
>>>>>>> 1.113
'moodle/site:restore' => array(
=======
'moodle/restore:createuser' => array(
>>>>>>> 1.75.2.23
'riskbitmask' => RISK_SPAM | RISK_PERSONAL,