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

Now setup.php detects is CFG->unicode is not set and examines

Browse Source 
DB to detect such value dinamically. Useful for installations
not using the standard installer but manually edited config.php
files.
Little TODO: modify a bit the initial config tables insets to
insert this value, avoiding to call it for each request. Coming
soon (although not mandatory for 1.6beta). Tested against both
MySQL and PostgreSQL with unicode and non-unicode DBs.
This commit is contained in:
stronk7
2006-03-27 11:24:14 +00:00
parent 4431d2e036
commit 7104d80dbc
2 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/setup.php
+23 -8
View File
@@ -149,14 +149,9 @@ global $HTTPSPAGEREQUIRED;
die;
}
/// Set the client/server and connection to utf8 if necessary
if ($dbconnected && $CFG->unicodedb) {
if ($db->databaseType == 'mysql') {
$db->Execute("SET NAMES 'utf8'");
} else if ($db->databaseType == 'postgres7') {
$db->Execute("SET NAMES 'utf8'");
}
}
/// Starting here we have a correct DB conection but me must avoid
/// to execute any DB transaction until "set names" has been executed
/// some lines below!
error_reporting(E_ALL); // Show errors from now on.
@@ -201,6 +196,26 @@ global $HTTPSPAGEREQUIRED;
error_reporting($CFG->debug);
/// If $CFG->unicodedb is not set, calculate it because we need
/// "set names" (below) properly executed *before* performing any
/// DB transaction
if ($dbconnected && !isset($CFG->unicodedb)) {
$CFG->unicodedb = setup_is_unicodedb();
}
/// Set the client/server and connection to utf8 if necessary
if ($dbconnected && $CFG->unicodedb) {
if ($db->databaseType == 'mysql') {
$db->Execute("SET NAMES 'utf8'");
} else if ($db->databaseType == 'postgres7') {
$db->Execute("SET NAMES 'utf8'");
}
}
/// Now that "set names" has been executed it is safe to
/// work with the DB, but never before this!
/// Set a default enrolment configuration (see bug 1598)
if (!isset($CFG->enrol)) {
$CFG->enrol = 'manual';