From b3da048e390ebd148a4fe5708ad2a0284f226bc4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Sun, 13 May 2012 12:37:03 -0400
Subject: [PATCH] Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8
---
program/lib/PEAR.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/lib/PEAR.php b/program/lib/PEAR.php
index a792d9f..f4dfd96 100644
--- a/program/lib/PEAR.php
+++ b/program/lib/PEAR.php
@@ -263,9 +263,9 @@
* @access public
* @return bool true if parameter is an error
*/
- function isError($data, $code = null)
+ static function isError($data, $code = null)
{
- if (!is_a($data, 'PEAR_Error')) {
+ if (!is_object($data) || !is_a($data, 'PEAR_Error')) {
return false;
}
--
Gitblit v1.9.1