Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/lib/framework.php b/lib/framework.php
index c534bebd04d4d90928b184a950aea8ee2bc7487d..30c8b0f7ce89befcf51759afea7368eb878dcdab 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -167,7 +167,7 @@ require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/lib/mail.php';
 
 //set PEAR error handling to use regular PHP exceptions
-function PEAR_ErrorToPEAR_Exception($err)
+function PEAR_ErrorToPEAR_Exception(PEAR_Error $err)
 {
     //DB_DataObject throws error when an empty set would be returned
     //That behavior is weird, and not how the rest of StatusNet works.