Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23912
Modified Files:
serendipity.css.php serendipity_admin.php
serendipity_config.inc.php
Log Message:
hopefully fix CSS borkage of admin panel for installation
Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity.css.php 11 Jan 2005 12:53:27 -0000 1.34
+++ serendipity.css.php 13 Jan 2005 18:09:38 -0000 1.35
@@ -2,8 +2,14 @@
session_start();
+/* This is a small hack to allow CSS display during installations and upgrades */
+define('IN_installer', true);
+define('IN_upgrader', true);
+
+include_once('serendipity_config.inc.php');
+
if (!isset($css_mode)) {
- $css_mode = 'frontend';
+ $css_mode = 'serendipity.css';
}
switch($css_mode) {
@@ -19,12 +25,6 @@
break;
}
-/* This is a small hack to allow CSS display during installations and upgrades */
-define('IN_installer', true);
-define('IN_upgrader', true);
-
-include_once('serendipity_config.inc.php');
-
header('Content-type: text/css');
function serendipity_printStylesheet($file) {
global $serendipity;
@@ -33,7 +33,7 @@
if (IS_installed === false) {
if (file_exists('templates/' . $serendipity['defaultTemplate'] . '/' . $css_file)) {
- echo serendipity_printStylesheet('templates/'. $serendipity['defaultTemplate'] . $css_file);
+ echo serendipity_printStylesheet('templates/' . $serendipity['defaultTemplate'] . '/' . $css_file);
}
die();
}
Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- serendipity_config.inc.php 11 Jan 2005 13:00:37 -0000 1.132
+++ serendipity_config.inc.php 13 Jan 2005 18:09:38 -0000 1.133
@@ -163,6 +163,7 @@
if (defined('IN_installer') && IS_installed === false) {
$serendipity['lang'] = $serendipity['autolang'];
+ $css_mode = 'serendipity_admin.css';
return 1;
}
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_admin.php 11 Jan 2005 13:00:36 -0000 1.59
+++ serendipity_admin.php 13 Jan 2005 18:09:38 -0000 1.60
@@ -11,6 +11,9 @@
if (IS_installed === false) {
require_once(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');
require_once S9Y_INCLUDE_PATH . 'include/functions_config.inc.php';
+ $css_file = 'serendipity.css.php';
+} else {
+ $css_file = serendipity_rewriteURL('serendipity_admin.css');
}
if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout') {
@@ -31,7 +34,7 @@
<head>
<title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
- <link rel="stylesheet" type="text/css" href="<?php echo serendipity_rewriteURL('serendipity_admin.css'); ?>" />
+ <link rel="stylesheet" type="text/css" href="<?php echo $css_file; ?>" />
<script type="text/javascript">
function spawn() {
if (self.Spawnextended) {
|
