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

Merged from MOODLE_15_STABLE - Fix for bug 4011 -- a MySQL specific workaround did not work with database names with hyphens, and broke the whole plugin for other databases. This patch fixes both issues.

Browse Source
This commit is contained in:
martinlanghoff
2005-09-07 06:12:40 +00:00
parent 95d71ad3a3
commit fd734f6165
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/database/enrol.php
+6 -5
View File
@@ -21,13 +21,14 @@ function get_student_courses(&$user) {
/// If the database fails we can at least use this
// This is a hack to workaround what seems to be a bug in ADOdb with accessing
// two databases of the same kind ... it seems to get confused when trying to access
// two MySQL databases ... it seems to get confused when trying to access
// the first database again, after having accessed the second.
// The following hack will make the database explicit which keeps it happy
if (strpos($CFG->prefix, $CFG->dbname) === false) {
$oldprefix = $CFG->prefix;
$CFG->prefix = "$CFG->dbname.$CFG->prefix";
if ($CFG->dbtype === 'mysql' && $CFG->enrol_dbtype === 'mysql') {
if (strpos($CFG->prefix, $CFG->dbname) === false) {
$oldprefix = $CFG->prefix;
$CFG->prefix = "`$CFG->dbname`.$CFG->prefix";
}
}
// Try to connect to the external database