From 6f8979c13c9380a4327b5dd09eafd100041a74f8 Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Thu, 18 Oct 2007 17:43:39 +0000
Subject: [PATCH]     * Patch PEAR.php for better detection, if already
 included.       Thanks to Assen Tchorbadjiev.

---
 bundled-libs/PEAR.php | 5 +++--
 docs/NEWS             | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundled-libs/PEAR.php b/bundled-libs/PEAR.php
index d4cf894..393d68c 100644
--- a/bundled-libs/PEAR.php
+++ b/bundled-libs/PEAR.php
@@ -22,7 +22,7 @@
 //
 
 // Serendipity-Patch
-if (class_exists('PEAR')) {
+if (defined('PEAR_ERROR_RETURN')) {
     return false;
 }
 // Serendipity-Patch end
@@ -738,7 +738,7 @@ class PEAR
 }
 
 // {{{ _PEAR_call_destructors()
-
+if (!function_exists('_PEAR_call_destructors')) {
 function _PEAR_call_destructors()
 {
     global $_PEAR_destructor_object_list;
@@ -773,6 +773,7 @@ function _PEAR_call_destructors()
         }
     }
 }
+}
 
 // }}}
 
diff --git a/docs/NEWS b/docs/NEWS
index 621d04d..780df6b 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.3 ()
 ------------------------------------------------------------------------
 
+    * Patch PEAR.php for better detection, if already included.
+      Thanks to Assen Tchorbadjiev.
+
     * Fix wrong entry timestamp used in comment feeds (garvinhicking)
 
     * Add experimental DB layer for "SQLRelay" database proxy extension, 
-- 
2.39.5