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

Merge branch 'w14_MDL-32149_m23_phpunit2' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-04-04 01:32:15 +02:00
parent 959a709ebe d78e33488a
commit 2000cd85da
151 changed files with 26485 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+13 -8
View File
@@ -10767,17 +10767,22 @@ class lang_string {
$this->a = $a;
} else if ($a instanceof lang_string) {
$this->a = $a->out();
} else if (is_object($a)) {
$this->a = new stdClass;
foreach (get_object_vars($a) as $key => $value) {
// Make sure conversion errors don't get displayed (results in '')
$this->a->$key = @(string)$value;
}
} else if (is_array($a)) {
} else if (is_object($a) or is_array($a)) {
$a = (array)$a;
$this->a = array();
foreach ($a as $key => $value) {
// Make sure conversion errors don't get displayed (results in '')
$this->a[$key] = @(string)$value;
if (is_array($value)) {
$this->a[$key] = '';
} else if (is_object($value)) {
if (method_exists($value, '__toString')) {
$this->a[$key] = $value->__toString();
} else {
$this->a[$key] = '';
}
} else {
$this->a[$key] = (string)$value;
}
}
}
}