diff options
author | James Walker <walkah@walkah.net> | 2010-07-27 12:18:40 -0400 |
---|---|---|
committer | James Walker <walkah@walkah.net> | 2010-07-27 12:18:40 -0400 |
commit | 772018810b7b6ea2b8cf18a1b9275fbac8c78343 (patch) | |
tree | df788d098e5f982322c36d7c2954ac41f9b21fda /classes | |
parent | 7065450f03078fb1ac2105b75f9c7a4e052bca9c (diff) | |
parent | 65862d8f7f45d487d4714137af96d3a24e4ca386 (diff) |
Merge branch 'master' into testing
Diffstat (limited to 'classes')
-rw-r--r-- | classes/Foreign_user.php | 16 | ||||
-rw-r--r-- | classes/Memcached_DataObject.php | 4 | ||||
-rw-r--r-- | classes/Notice.php | 8 |
3 files changed, 25 insertions, 3 deletions
diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php index 0dd94ffb9..e98a16064 100644 --- a/classes/Foreign_user.php +++ b/classes/Foreign_user.php @@ -39,6 +39,22 @@ class Foreign_user extends Memcached_DataObject return null; } + static function getByNickname($nickname, $service) + { + if (empty($nickname) || empty($service)) { + return null; + } else { + $fuser = new Foreign_user(); + $fuser->service = $service; + $fuser->nickname = $nickname; + $fuser->limit(1); + + $result = $fuser->find(true); + + return empty($result) ? null : $fuser; + } + } + function updateKeys(&$orig) { $this->_connect(); diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 4579f64df..a7fec365e 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -593,7 +593,7 @@ class Memcached_DataObject extends Safe_DataObject return $c->get($cacheKey); } - static function cacheSet($keyPart, $value) + static function cacheSet($keyPart, $value, $flag=null, $expiry=null) { $c = self::memcache(); @@ -603,7 +603,7 @@ class Memcached_DataObject extends Safe_DataObject $cacheKey = common_cache_key($keyPart); - return $c->set($cacheKey, $value); + return $c->set($cacheKey, $value, $flag, $expiry); } static function valueString($v) diff --git a/classes/Notice.php b/classes/Notice.php index 482bc550b..ae7e2e540 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -90,7 +90,13 @@ class Notice extends Memcached_DataObject function getProfile() { - return Profile::staticGet('id', $this->profile_id); + $profile = Profile::staticGet('id', $this->profile_id); + + if (empty($profile)) { + throw new ServerException(sprintf(_('No such profile (%d) for notice (%d)'), $this->profile_id, $this->id)); + } + + return $profile; } function delete() |