[php-blog-cvs] serendipity serendipity.css.php,1.7,1.8

[<gsc...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv14821

Modified Files:
	serendipity.css.php 
Log Message:
this affects tom's changes while leaving the intended default behavior.


Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity.css.php	25 Jun 2003 20:26:45 -0000	1.7
+++ serendipity.css.php	25 Jun 2003 20:44:40 -0000	1.8
@@ -1,8 +1,12 @@
 <?php
 header("Content-type: text/css");
-session_start();
-if (!file_exists("./serendipity_config_local.inc.php")) {
+if (!@include_once("serendipity_config.inc.php")) {
 	readfile('serendipity.css');
+} 
+else if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') ."/style.css") ) {
+	readfile ($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') ."/style.css");
+} else if ( file_exists($serendipity['templatePath'] ."default/style.css")) {
+	readfile ($serendipity['templatePath'] ."default/style.css");
 } else {
 	include_once("serendipity_config.inc.php");
 	$css = serendipity_getCSS($_REQUEST['style']);