From c73b6940e85e026246db9c1e46ce59fe897112be Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Thu, 18 Oct 2007 17:44:06 +0000
Subject: [PATCH] backport

---
 bundled-libs/PEAR.php | 5 +++--
 docs/NEWS             | 4 ++++
 2 files changed, 7 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 cca3eae..8fff038 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -2,6 +2,10 @@
 
 Version 1.2.1 ()
 ------------------------------------------------------------------------
+
+    * Patch PEAR.php for better detection, if already included.
+      Thanks to Assen Tchorbadjiev.
+          
     * Fix admin entry list when no entries exist or meet filter
       criteria. (Don Chambers)
 
-- 
2.39.5