Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --git a/lib/util.php b/lib/util.php
index ed81aeba16ceffde2a25c84c1229f7c26dca7358..df3110ddd658b750191ad775e4e4a697cc216835 100644 (file)
--- 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 428aafb024574a3e208973b7d43cdb6e1ea87827..8b6ef54621f28e51430d0299ff0eae5f88125544 100644 (file)
--- 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;