Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x

[quix0rs-gnu-social.git] / lib / framework.php

diff --git a/lib/framework.php b/lib/framework.php
index 5d163547f78997436bce24c34695ed7d9280d5a9..f12ad8048a83961e546b3ceb07e19425710dd5fc 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -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_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
+define('STATUSNET_BASE_VERSION', '1.1.0');
+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', 'Get It Together');
+define('STATUSNET_CODENAME', 'Fight for Your Right');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -164,16 +164,15 @@ function PEAR_ErrorToPEAR_Exception($err)
     // keep the same broken connection. We die here to get a new
     // process started.
 
-    if (php_sapi_name() == 'cli' && preg_match('/nativecode=2006/', $msg)) {
+    if (php_sapi_name() == 'cli' && preg_match('/nativecode=2006/', $userInfo)) {
         common_log(LOG_ERR, "Lost DB connection; dying.");
         exit(100);
     }
 
     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');