Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
8e6a8961d9
@ -1416,6 +1416,7 @@ function common_memcache()
|
|||||||
} else {
|
} else {
|
||||||
$cache->addServer($servers);
|
$cache->addServer($servers);
|
||||||
}
|
}
|
||||||
|
$cache->setCompressThreshold(20000, 0.2);
|
||||||
}
|
}
|
||||||
return $cache;
|
return $cache;
|
||||||
}
|
}
|
||||||
|
@ -34,6 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||||||
// We bundle the phpCAS library...
|
// We bundle the phpCAS library...
|
||||||
set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/CAS');
|
set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/CAS');
|
||||||
|
|
||||||
|
require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php';
|
||||||
class CasAuthenticationPlugin extends AuthenticationPlugin
|
class CasAuthenticationPlugin extends AuthenticationPlugin
|
||||||
{
|
{
|
||||||
public $server;
|
public $server;
|
||||||
|
Loading…
Reference in New Issue
Block a user