From: garvinhicking <garvinhicking>
Date: Wed, 25 Jan 2006 10:21:03 +0000 (+0000)
Subject: Don't try to declare this class, if already existing.
X-Git-Tag: 1.0~144
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d0a73b65f79e178358c7775c780ec6cf33cf11b8;p=s9y.git

Don't try to declare this class, if already existing.
---

diff --git a/bundled-libs/PEAR.php b/bundled-libs/PEAR.php
index 6f4d652..d4cf894 100644
--- a/bundled-libs/PEAR.php
+++ b/bundled-libs/PEAR.php
@@ -21,6 +21,12 @@
 // $Id: PEAR.php,v 1.83 2005/03/28 16:38:58 cellog Exp $
 //
 
+// Serendipity-Patch
+if (class_exists('PEAR')) {
+    return false;
+}
+// Serendipity-Patch end
+
 define('PEAR_ERROR_RETURN',     1);
 define('PEAR_ERROR_PRINT',      2);
 define('PEAR_ERROR_TRIGGER',    4);
@@ -1052,4 +1058,4 @@ class PEAR_Error
  * c-basic-offset: 4
  * End:
  */
-?>
+?>
\ No newline at end of file