GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

correct a couple of bugs

Browse Source 
darcs-hash:20080922190937-5ed1f-9439cd9cff178323ac1445f33e2520260b4b267e.gz
This commit is contained in:
Evan Prodromou 2008-09-22 15:09:37 -04:00
parent d73ed53535
commit e24425d44e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/User.php
View File

@ -149,6 +149,16 @@ class User extends DB_DataObject
} }
function noticesWithFriends($offset=0, $limit=20) { function noticesWithFriends($offset=0, $limit=20) {
# We clearly need a more elegant way to make this work.
if (common_config('memcached', 'enabled')) {
if ($offset + $limit <= WITHFRIENDS_CACHE_WINDOW) {
$cached = $this->noticesWithFriendsWindow();
$wrapper = new NoticeWrapper(array_slice($cached, $offset, $limit));
return $wrapper;
}
}
$notice = new Notice(); $notice = new Notice();

2
lib/util.php
View File

@ -497,7 +497,7 @@ function common_language() {
return $language; return $language;
} }
} else { } else {
return $config['site']['language']; return common_config('site', 'language');
} }
} }
# salted, hashed passwords are stored in the DB # salted, hashed passwords are stored in the DB