[php-blog-cvs] serendipity serendipity_config.inc.php,1.59,1.60

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650

Modified Files:
	serendipity_config.inc.php 
Log Message:
Be nice to certain apache configurations with Aliases.
Patch from Rchiard Thomas Harrison, thanks!


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_config.inc.php	21 Mar 2004 16:35:32 -0000	1.59
+++ serendipity_config.inc.php	22 Mar 2004 07:52:14 -0000	1.60
@@ -81,7 +81,13 @@
  *   Make sure that the file included is in the current directory and not any possible
  *   include path
  */
-include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
+if (file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php')) {
+    include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
+} elseif (file_exists($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php')) {
+    include_once($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php');
+} else {
+    include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
+}
 
 /*
  *  Include main functions