[php-blog-cvs] serendipity serendipity_functions_installer.inc.php,1.25,1.26

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

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

Modified Files:
	serendipity_functions_installer.inc.php 
Log Message:
does this fix the shared install htaccess problem maybe? It has to be something with using serendipityPath instead of S9Y_INCLUDE_PATH...I'm currently lacking a working shared install setup for testing. :(


Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_functions_installer.inc.php	27 Jul 2004 12:43:33 -0000	1.25
+++ serendipity_functions_installer.inc.php	28 Jul 2004 08:27:45 -0000	1.26
@@ -593,10 +593,11 @@
         }
     }
 
-    if(php_sapi_name() == 'cgi' || php_sapi_name() == 'cgi-fcgi')
+    if(php_sapi_name() == 'cgi' || php_sapi_name() == 'cgi-fcgi') {
       $htaccess_cgi = '.cgi';
-    else
+    } else {
       $htaccess_cgi = '';
+    }
 
     if ($rewrite == 'rewrite') {
         $template = 'htaccess' . $htaccess_cgi . '.rewrite.tpl';
@@ -606,7 +607,7 @@
         $template = 'htaccess' . $htaccess_cgi . '.normal.tpl';
     }
 
-    if (!($a = file($serendipity['serendipityPath'] . $template, 1))) {
+    if (!($a = file(S9Y_INCLUDE_PATH . $template, 1))) {
         $err[] = ERROR_TEMPLATE_FILE;
     }