Merge branch '1.0.x' into 1.1.x

Conflicts: lib/framework.php
2011-11-16 12:00:13 -05:00
parent a18d3facf8 b4ecb24907
commit f519858044
1654 changed files with 21062 additions and 11515 deletions
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -151,6 +151,14 @@ function PEAR_ErrorToPEAR_Exception($err)
    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($err->getMessage(), $err->getCode());
    }