summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/User.php21
1 files changed, 7 insertions, 14 deletions
diff --git a/classes/User.php b/classes/User.php
index 8b73923a7..65b2d663e 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -146,10 +146,7 @@ class User extends DB_DataObject
if (common_config('memcached', 'enabled')) {
if ($offset + $limit < WITHFRIENDS_CACHE_WINDOW) {
- $cached = $this->noticesWithFriendsCachedWindow();
- if (!$cached) {
- $cached = $this->noticesWithFriendsWindow();
- }
+ $cached = $this->noticesWithFriendsWindow();
$wrapper = new NoticeWrapper(array_slice($cached, $offset, $limit));
return $wrapper;
}
@@ -166,16 +163,6 @@ class User extends DB_DataObject
return $notice;
}
- function noticesWithFriendsCachedWindow() {
- $cache = new Memcache();
- $res = $cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'));
- if (!$res) {
- return NULL;
- }
- $notices = $cache->get(common_cache_key('user:notices_with_friends:' . $this->id));
- return $notices;
- }
-
function noticesWithFriendsWindow() {
$cache = new Memcache();
@@ -185,6 +172,12 @@ class User extends DB_DataObject
return NULL;
}
+ $notices = $cache->get(common_cache_key('user:notices_with_friends:' . $this->id));
+
+ if ($notices) {
+ return $notices;
+ }
+
$notice = new Notice();
$notice->query('SELECT notice.* ' .