diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-12-31 14:37:23 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-12-31 14:37:23 +0000 |
| commit | 8e6a8961d9a8568599796382e4fdea71b29d72cf (patch) | |
| tree | 6f58e8edd48fc0605393132dc803f02130f719f3 | |
| parent | c986f59143b1969dc4ae324409295728b1d06e82 (diff) | |
| parent | 1e9c03e1993b5d2978ac4c5213a8a64e0150b4a2 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
| -rw-r--r-- | lib/util.php | 1 | ||||
| -rw-r--r-- | plugins/CasAuthentication/CasAuthenticationPlugin.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/util.php b/lib/util.php index ed81aeba1..df3110ddd 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1416,6 +1416,7 @@ function common_memcache() } else { $cache->addServer($servers); } + $cache->setCompressThreshold(20000, 0.2); } return $cache; } diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 428aafb02..8b6ef5462 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -34,6 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { // We bundle the phpCAS library... set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/CAS'); +require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php'; class CasAuthenticationPlugin extends AuthenticationPlugin { public $server; |