eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

add exception on inconsistent db to User::getProfile()

Browse Source
This commit is contained in:
Evan Prodromou 2010-03-18 08:35:10 -05:00
parent 0a1b10114b
commit 425ddcaa26
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
classes/User.php
View File

@ -75,7 +75,11 @@ class User extends Memcached_DataObject
function getProfile() function getProfile()
{ {
return Profile::staticGet('id', $this->id); $profile = Profile::staticGet('id', $this->id);
if (empty($profile)) {
throw new UserNoProfileException($this);
}
return $profile;
} }
function isSubscribed($other) function isSubscribed($other)
@ -140,9 +144,6 @@ class User extends Memcached_DataObject
function getCurrentNotice() function getCurrentNotice()
{ {
$profile = $this->getProfile(); $profile = $this->getProfile();
if (!$profile) {
return null;
}
return $profile->getCurrentNotice(); return $profile->getCurrentNotice();
} }
@ -469,22 +470,14 @@ class User extends Memcached_DataObject
function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) { function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
$profile = $this->getProfile(); $profile = $this->getProfile();
if (!$profile) {
return null;
} else {
return $profile->getTaggedNotices($tag, $offset, $limit, $since_id, $before_id); return $profile->getTaggedNotices($tag, $offset, $limit, $since_id, $before_id);
} }
}
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{ {
$profile = $this->getProfile(); $profile = $this->getProfile();
if (!$profile) {
return null;
} else {
return $profile->getNotices($offset, $limit, $since_id, $before_id); return $profile->getNotices($offset, $limit, $since_id, $before_id);
} }
}
function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE, $own=false) function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE, $own=false)
{ {
@ -624,14 +617,12 @@ class User extends Memcached_DataObject
function getSubscriptions($offset=0, $limit=null) function getSubscriptions($offset=0, $limit=null)
{ {
$profile = $this->getProfile(); $profile = $this->getProfile();
assert(!empty($profile));
return $profile->getSubscriptions($offset, $limit); return $profile->getSubscriptions($offset, $limit);
} }
function getSubscribers($offset=0, $limit=null) function getSubscribers($offset=0, $limit=null)
{ {
$profile = $this->getProfile(); $profile = $this->getProfile();
assert(!empty($profile));
return $profile->getSubscribers($offset, $limit); return $profile->getSubscribers($offset, $limit);
} }
@ -695,9 +686,7 @@ class User extends Memcached_DataObject
function delete() function delete()
{ {
$profile = $this->getProfile(); $profile = $this->getProfile();
if ($profile) {
$profile->delete(); $profile->delete();
}
$related = array('Fave', $related = array('Fave',
'Confirm_address', 'Confirm_address',