moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged fix for a bug when user's lang is not set, fall back to site lang

Browse source
This commit is contained in:
toyomoyo 2006-08-10 02:43:22 +00:00
parent 805f61dd6c
commit c04ba75f8f
1 changed files with 108 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

135
lib/db/migrate2utf8.php
View file

@ -75,9 +75,9 @@ function migrate2utf8_user($fields, $crash, $debug, $maxrecords, $done, $tablest
// this is the only encoding we need for this table // this is the only encoding we need for this table
if ($globallang) { if ($globallang) {
$fromenc = $globallang; $fromenc = $globallang;
} else { } else {
$fromenc = get_original_encoding('','',$record->lang); $fromenc = get_original_encoding($CFG->lang,'',$record->lang);
} }
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) { if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
@ -189,35 +189,116 @@ function migrate2utf8_user($fields, $crash, $debug, $maxrecords, $done, $tablest
} }
/*********************************************
* Development under progress *
* This space is left intentionally blank *
*********************************************/ function migrate2utf8_role_name($recordid){
/********************************************* global $CFG, $globallang;
* Development under progress *
* This space is left intentionally blank * /// Some trivial checks
*********************************************/ if (empty($recordid)) {
/********************************************* log_the_problem_somewhere();
* Development under progress * return false;
* This space is left intentionally blank * }
*********************************************/
/********************************************* if (!$role = get_record('role', 'id', $recordid)) {
* Development under progress * log_the_problem_somewhere();
* This space is left intentionally blank * return false;
*********************************************/ }
/********************************************* if ($globallang) {
* Development under progress * $fromenc = $globallang;
* This space is left intentionally blank * } else {
*********************************************/ $sitelang = $CFG->lang;
/********************************************* $courselang = null; //Non existing!
* Development under progress * $userlang = null; // Non existing
* This space is left intentionally blank * $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
*********************************************/ }
/// We are going to use textlib facilities
/// Convert the text
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
$result = utfconvert($role->name, $fromenc);
$newrole = new object;
$newrole->id = $recordid;
$newrole->name = $result;
migrate2utf8_update_record('role',$newrole);
}
/// And finally, just return the converted field
return $result;
}
function migrate2utf8_role_description($recordid){
global $CFG, $globallang;
/// Some trivial checks
if (empty($recordid)) {
log_the_problem_somewhere();
return false;
}
if (!$role = get_record('role', 'id', $recordid)) {
log_the_problem_somewhere();
return false;
}
if ($globallang) {
$fromenc = $globallang;
} else {
$sitelang = $CFG->lang;
$courselang = null; //Non existing!
$userlang = null; // Non existing
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
}
/// We are going to use textlib facilities
/// Convert the text
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
$result = utfconvert($role->description, $fromenc);
$newrole = new object;
$newrole->id = $recordid;
$newrole->description = $result;
migrate2utf8_update_record('role',$newrole);
}
/// And finally, just return the converted field
return $result;
}
function migrate2utf8_role_names_text($recordid){
global $CFG, $globallang;
/// Some trivial checks
if (empty($recordid)) {
log_the_problem_somewhere();
return false;
}
if (!$rn = get_record('role_names', 'id', $recordid)) {
log_the_problem_somewhere();
return false;
}
if ($globallang) {
$fromenc = $globallang;
} else {
$sitelang = $CFG->lang;
$courselang = null; //Non existing!
$userlang = null; // Non existing
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
}
/// We are going to use textlib facilities
/// Convert the text
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
$result = utfconvert($rn->text, $fromenc);
$newrn = new object;
$newrn->id = $recordid;
$newrn->text = $result;
migrate2utf8_update_record('role_names',$newrn);
}
/// And finally, just return the converted field
return $result;
}
function migrate2utf8_post_subject($recordid){ function migrate2utf8_post_subject($recordid){
global $CFG, $globallang; global $CFG, $globallang;