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

Now help information is back again (typo in js) and, under MySQL, the script is

Browse Source 
able to change DB encoding if empty.
This commit is contained in:
stronk7
2007-01-13 20:06:17 +00:00
parent 4e9e64230f
commit 3facbe6632
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.php
+5 -6
View File
@@ -345,17 +345,16 @@ if ($INSTALL['stage'] == DATABASE) {
} else {
/// We have been able to connect properly, just test the database encoding now.
/// It must be Unicode for 1.8 installations.
$encoding = '';
switch ($INSTALL['dbtype']) {
case 'mysql':
///Get MySQL character_set_database value
/// Get MySQL character_set_database value
$rs = $db->Execute("SHOW VARIABLES LIKE 'character_set_database'");
if ($rs && $rs->RecordCount() > 0) {
$records = $rs->GetAssoc(true);
$encoding = $records['character_set_database']['Value'];
if (!strtoupper($encoding) == 'UTF8') {
// Try to set the encoding now!
if (strtoupper($encoding) != 'UTF8') {
/// Try to set the encoding now!
if (! $db->Metatables()) { // We have no tables so go ahead
$db->Execute("ALTER DATABASE `".$INSTALL['dbname']."` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci");
$rs = $db->Execute("SHOW VARIABLES LIKE 'character_set_database'"); // this works
@@ -1195,8 +1194,8 @@ function database_js() {
function toggledbinfo() {
//Calculate selected value
var showid = 'mysql';
if (getElementById('installform').dbtype.value) {
showid = getElementById('installform').dbtype.value;
if (document.getElementById('installform').dbtype.value) {
showid = document.getElementById('installform').dbtype.value;
}
if (document.getElementById) {
//Hide all the divs