Fix warning message when installing. Sigh.

diff --git a/docs/NEWS b/docs/NEWS
index 8d68d5400c2e9f6bb5d48a4e4c257390e4044f44..2c6ef1789664f1dabcfe1fd71e77120480c95318 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.8.5 ()
 ------------------------------------------------------------------------
 
+    * Fix cosmetic warning message about missing S9Y_PEAR_PATH when 
+      installing. (garvinhicking)
+ 
 Version 0.8.4 (August 19th, 2005)
 ------------------------------------------------------------------------
 

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 6c3858085bee8ed58daf0f1a908239ba039c6823..fdbab1ce80455b9bf0424ef7b403ee50baa75227 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -167,6 +167,20 @@ if ( !defined('IN_installer') && IS_installed === false ) {
     serendipity_die(sprintf(SERENDIPITY_NOT_INSTALLED, 'serendipity_admin.php'));
 }
 
+// Check whether local or global PEAR should be used. You can put a
+// $serendipity['use_PEAR'] = true;
+// in your serendipity_config_local.inc.php file to enable this.
+// The required PEAR (and other) packages are mentioned in the file
+// bundled-libs/.current_version
+$old_include = @ini_get('include_path');
+if (@ini_set('include_path', $old_include . PATH_SEPARATOR . $serendipity['serendipityPath'] . PATH_SEPARATOR . $serendipity['serendipityPath'] . 'bundled-libs/') && $serendipity['use_PEAR']) {
+    @define('S9Y_PEAR', true);
+    @define('S9Y_PEAR_PATH', '');
+} else {
+    @define('S9Y_PEAR', false);
+    @define('S9Y_PEAR_PATH', S9Y_INCLUDE_PATH . 'bundled-libs/');
+}
+
 if (defined('IN_installer') && IS_installed === false) {
     $serendipity['lang'] = $serendipity['autolang'];
     $css_mode            = 'serendipity_admin.css';
@@ -189,20 +203,6 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/se
 
 define('IS_up2date', version_compare($serendipity['version'], $serendipity['versionInstalled'], '<='));
 
-// Check whether local or global PEAR should be used. You can put a
-// $serendipity['use_PEAR'] = true;
-// in your serendipity_config_local.inc.php file to enable this.
-// The required PEAR (and other) packages are mentioned in the file
-// bundled-libs/.current_version
-$old_include = @ini_get('include_path');
-if (@ini_set('include_path', $old_include . PATH_SEPARATOR . $serendipity['serendipityPath'] . PATH_SEPARATOR . $serendipity['serendipityPath'] . 'bundled-libs/') && $serendipity['use_PEAR']) {
-    @define('S9Y_PEAR', true);
-    @define('S9Y_PEAR_PATH', '');
-} else {
-    @define('S9Y_PEAR', false);
-    @define('S9Y_PEAR_PATH', S9Y_INCLUDE_PATH . 'bundled-libs/');
-}
-
 /*
  *  Include main functions
  */