MDL-25935 user_picture::unalias() now handles null values correctly

This commit is contained in:
David Mudrak
2011-01-11 00:27:42 +01:00
parent 5c0d03ea1c
commit 9ecbf8018f
2 changed files with 29 additions and 3 deletions
+3 -3
View File
@@ -237,11 +237,11 @@ class user_picture implements renderable {
foreach (self::$fields as $field) {
if ($field === 'id') {
if (isset($record->{$idalias})) {
if (property_exists($record, $idalias)) {
$return->id = $record->{$idalias};
}
} else {
if (isset($record->{$fieldprefix.$field})) {
if (property_exists($record, $fieldprefix.$field)) {
$return->{$field} = $record->{$fieldprefix.$field};
}
}
@@ -249,7 +249,7 @@ class user_picture implements renderable {
// add extra fields if not already there
if ($extrafields) {
foreach ($extrafields as $e) {
if ($e === 'id' or isset($return->{$e})) {
if ($e === 'id' or property_exists($return, $e)) {
continue;
}
$return->{$e} = $record->{$fieldprefix.$e};