From 8bfbd5e9f9c1d2c4657bda2f6099f01fc8097846 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 31 Jan 2013 12:26:47 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
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