diff options
| author | Brion Vibber <brion@pobox.com> | 2010-07-28 11:56:55 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-07-28 11:56:55 -0700 |
| commit | 189d34173311828ccfe0aec5f381ad26887384ce (patch) | |
| tree | 7ab42efa3c30248879ba671500f7c3baab257779 /classes | |
| parent | 5688c635a62ea109a9aa9565e40e994ea984cd95 (diff) | |
| parent | db90bcb3293985818e2645827ed5a568f27d1511 (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 4 | ||||
| -rw-r--r-- | classes/User.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index ae7e2e540..8552248ba 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -42,10 +42,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -/* We keep the first three 20-notice pages, plus one for pagination check, +/* We keep 200 notices, the max number of notices available per API request, * in the memcached cache. */ -define('NOTICE_CACHE_WINDOW', 61); +define('NOTICE_CACHE_WINDOW', 200); define('MAX_BOXCARS', 128); diff --git a/classes/User.php b/classes/User.php index 2abb7eeb6..cf8d4527b 100644 --- a/classes/User.php +++ b/classes/User.php @@ -524,7 +524,7 @@ class User extends Memcached_DataObject if ($this->id == $other->id) { common_log(LOG_WARNING, sprintf( - "Profile ID %d (%s) tried to block his or herself.", + "Profile ID %d (%s) tried to block themself.", $this->id, $this->nickname ) |