Merge branch 'testing-sig' of gitorious.org:~brion/statusnet/brion-fixes into testing

diff --combined lib/common.php
index 22890b5cb751d8e0336953e10f4d0e72e7e00546,b072a4969963a9ca1c23e3c14287996f349afd8f..4861731dfdd2d348607980f63dbe2f79876575d7
--- 1/lib/common.php
--- 2/lib/common.php
+++ b/lib/common.php
@@@ -22,13 -22,13 +22,13 @@@ if (!defined('STATUSNET') && !defined('
  //exit with 200 response, if this is checking fancy from the installer
  if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
  
 -define('STATUSNET_BASE_VERSION', '0.9.8');
 -define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 +define('STATUSNET_BASE_VERSION', '0.9.7');
 +define('STATUSNET_LIFECYCLE', 'alpha1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
  define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
  
  define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
  
 -define('STATUSNET_CODENAME', 'Letter Never Sent');
 +define('STATUSNET_CODENAME', 'World Leader Pretend');
  
  define('AVATAR_PROFILE_SIZE', 96);
  define('AVATAR_STREAM_SIZE', 48);
@@@ -95,7 -95,11 +95,11 @@@ function _have_config(
      return StatusNet::haveConfig();
  }
  
- function __autoload($cls)
+ /**
+  * Wrapper for class autoloaders.
+  * This used to be the special function name __autoload(), but that causes bugs with PHPUnit 3.5+
+  */
+ function autoload_sn($cls)
  {
      if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
          require_once(INSTALLDIR.'/classes/' . $cls . '.php');
@@@ -111,6 -115,8 +115,8 @@@
      }
  }
  
+ spl_autoload_register('autoload_sn');
+ 
  // XXX: how many of these could be auto-loaded on use?
  // XXX: note that these files should not use config options
  // at compile time since DB config options are not yet loaded.