Better include_path set check

diff --git a/docs/NEWS b/docs/NEWS
index 253e28f0b5970351dd68e7b0172f1c7f858ffa95..846f87624df1434768afb24f66afa451f121acff 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,5 +1,11 @@
 # $Id$
 
+Version 1.1.2 ()
+------------------------------------------------------------------------
+
+    * Better checks to see if the local PEAR inclusion is required
+      (garvinhicking)
+
 Version 1.1.1 (February 22nd, 2007)
 ------------------------------------------------------------------------
 

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index da9cda20468e58724cb1085f942982d1be01dd49..23eb0db20451d8ed11fbe4ef2b010959f8bb9892 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -31,7 +31,7 @@ if (!defined('IN_serendipity')) {
 include(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
 // The version string
-$serendipity['version']         = '1.1.1';
+$serendipity['version']         = '1.1.2';
 
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
@@ -187,7 +187,7 @@ if (function_exists('set_include_path')) {
     $use_include = @ini_set('include_path', $new_include);
 }
 
-if ($use_include) {
+if ($use_include !== FALSE && $use_include == $new_include) {
     @define('S9Y_PEAR',      true);
     @define('S9Y_PEAR_PATH', '');
 } else {