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

2009-12-31 09:14:55 -10:00
parent ad8ea98cd7 01dbee2ba5
commit 053b8c600d
49 changed files with 4268 additions and 3298 deletions
--- 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;