Merge branch '1.0.x' into 1.1.x

Conflicts:
	lib/framework.php

diff --combined lib/framework.php
index 05a8b7abda7728d8195da5167cbd34dfe4c2c4c0,4458313eb974ea294e9615727916ebc175f9e256..69c1e4f6c8c048058f58b4530e625a8a1df8d25b
--- 1/lib/framework.php
--- 2/lib/framework.php
+++ b/lib/framework.php
@@@ -19,13 -19,13 +19,13 @@@
  
  if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  
 -define('STATUSNET_BASE_VERSION', '1.0.1');
 -define('STATUSNET_LIFECYCLE', ''); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 +define('STATUSNET_BASE_VERSION', '1.1.0');
 +define('STATUSNET_LIFECYCLE', 'dev'); // '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', 'Get It Together');
 +define('STATUSNET_CODENAME', 'Fight for Your Right');
  
  define('AVATAR_PROFILE_SIZE', 96);
  define('AVATAR_STREAM_SIZE', 48);
@@@ -34,6 -34,7 +34,6 @@@ define('AVATAR_MINI_SIZE', 24)
  define('NOTICES_PER_PAGE', 20);
  define('PROFILES_PER_PAGE', 20);
  define('MESSAGES_PER_PAGE', 20);
 -define('GROUPS_PER_PAGE', 20);
  
  define('FOREIGN_NOTICE_SEND', 1);
  define('FOREIGN_NOTICE_RECV', 2);
@@@ -151,10 -152,19 +151,18 @@@ function PEAR_ErrorToPEAR_Exception($er
      if ($err->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
          return;
      }
+ 
+     $msg      = $err->getMessage();
+     $userInfo = $err->getUserInfo();
+ 
+     // Log this; push the message up as an exception
+ 
+     common_log(LOG_ERR, "PEAR Error: $msg ($userInfo)");
+ 
      if ($err->getCode()) {
 -        throw new PEAR_Exception($msg, $err, $err->getCode());
 -    } else {
 -        throw new PEAR_Exception($msg, $err);
 +        throw new PEAR_Exception($err->getMessage(), $err->getCode());
      }
 +    throw new PEAR_Exception($err->getMessage());
  }
  
  PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');