backport

diff --git a/bundled-libs/PEAR.php b/bundled-libs/PEAR.php
index d4cf894a637084bcd726718b85758714085d5d70..393d68cbbfe5401ed2f9f70e7c41e1df7366e490 100644 (file)
--- 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 cca3eae6dc648752499c3bf0e7324b29afc5dbc2..8fff0388cd6f13b6816f9efd26b5c2625ba8cf9c 100644 (file)
--- 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)