wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow default data from Profile_prefs::getData call

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-07-13 16:26:08 +02:00
parent 933bf0b026
commit b67a611ca7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/Profile_prefs.php
View File

@ -112,8 +112,17 @@ class Profile_prefs extends Managed_DataObject
return $pref;
}
static function getData(Profile $profile, $namespace, $topic) {
$pref = self::getTopic($profile, $namespace, $topic);
static function getData(Profile $profile, $namespace, $topic, $def=null) {
try {
$pref = self::getTopic($profile, $namespace, $topic);
} catch (NoResultException $e) {
if ($def === null) {
// If no default value was set, continue the exception.
throw $e;
}
// If there was a default value, return that.
return $def;
}
return $pref->data;
}