summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-18 10:55:20 -0700
committerBrion Vibber <brion@pobox.com>2010-03-18 10:55:20 -0700
commit1de7badd78bb3cddc99a6960ec6a395a191ce6be (patch)
tree54e30bc1608cec62a88b3e0e77c5a47b97a071f1 /classes/User.php
parentca5612c451e4dabde107ff2cfbc737a2f69136df (diff)
parent515cdf28a83eda5cc82f0c423099a36c0168dbb6 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php28
1 files changed, 9 insertions, 19 deletions
diff --git a/classes/User.php b/classes/User.php
index 77091fad5..16c256535 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -75,7 +75,11 @@ class User extends Memcached_DataObject
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)
@@ -87,6 +91,7 @@ class User extends Memcached_DataObject
function updateKeys(&$orig)
{
+ $this->_connect();
$parts = array();
foreach (array('nickname', 'email', 'jabber', 'incomingemail', 'sms', 'carrier', 'smsemail', 'language', 'timezone') as $k) {
if (strcmp($this->$k, $orig->$k) != 0) {
@@ -140,9 +145,6 @@ class User extends Memcached_DataObject
function getCurrentNotice()
{
$profile = $this->getProfile();
- if (!$profile) {
- return null;
- }
return $profile->getCurrentNotice();
}
@@ -470,21 +472,13 @@ class User extends Memcached_DataObject
function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
$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)
{
$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)
@@ -625,14 +619,12 @@ class User extends Memcached_DataObject
function getSubscriptions($offset=0, $limit=null)
{
$profile = $this->getProfile();
- assert(!empty($profile));
return $profile->getSubscriptions($offset, $limit);
}
function getSubscribers($offset=0, $limit=null)
{
$profile = $this->getProfile();
- assert(!empty($profile));
return $profile->getSubscribers($offset, $limit);
}
@@ -696,9 +688,7 @@ class User extends Memcached_DataObject
function delete()
{
$profile = $this->getProfile();
- if ($profile) {
- $profile->delete();
- }
+ $profile->delete();
$related = array('Fave',
'Confirm_address',