|
From: Tom S. <tom...@us...> - 2004-07-28 16:39:59
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11327 Modified Files: NEWS serendipity.css.php serendipity_config.inc.php serendipity_functions.inc.php serendipity_functions_installer.inc.php Removed Files: serendipity.css serendipity_admin_css.inc.php Log Message: * Remove all traces of {dbPrefix}css, including deprecated functions etc. * Bumped version to 0.6.11 * Added $serendipity['defaultTemplate'] which contains the name of the folder for the default template - the template used for fallback Index: serendipity.css.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- serendipity.css.php 13 Jul 2004 14:15:17 -0000 1.27 +++ serendipity.css.php 28 Jul 2004 16:39:47 -0000 1.28 @@ -11,26 +11,20 @@ header('Content-type: text/css'); function serendipity_printStylesheet($file) { global $serendipity; - return str_replace('{TEMPLATE_PATH}', dirname($file) .'/', file_get_contents($file, 1)); + return str_replace('{TEMPLATE_PATH}', dirname($file) .'/', @file_get_contents($file, 1)); } -if (!file_exists('serendipity_config_local.inc.php')) { - if (file_exists('templates/default/style.css')) { - echo serendipity_printStylesheet('templates/default/style.css'); - } else { - readfile(S9Y_INCLUDE_PATH . 'serendipity.css'); +if (IS_Installed === false) { + if (file_exists('templates/'. $serendipity['defaultTempalte'] .'/style.css')) { + echo serendipity_printStylesheet('templates/'. $serendipity['defaultTempalte'] .'/style.css'); } die(); } -if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css')) { - $out = serendipity_printStylesheet($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css'); -} else { - $css = serendipity_getCSS($_REQUEST['style']); - $out = &$css['data']; -} +$out = serendipity_printStylesheet(serendipity_getTemplateFile('style.css', 'serendipityPath')); echo $out; + serendipity_plugin_api::hook_event('css', $out); /* vim: set sts=4 ts=4 expandtab : */ Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- serendipity_config.inc.php 28 Jul 2004 08:46:38 -0000 1.89 +++ serendipity_config.inc.php 28 Jul 2004 16:39:47 -0000 1.90 @@ -14,10 +14,12 @@ } include_once(S9Y_INCLUDE_PATH . 'compat.php'); -$serendipity['version'] = '0.6.10-CVS'; -$serendipity['production'] = 1; -$serendipity['rewrite'] = 'none'; -$serendipity['messagestack'] = array(); + +$serendipity['version'] = '0.6.11-CVS'; +$serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme +$serendipity['production'] = 1; +$serendipity['rewrite'] = 'none'; +$serendipity['messagestack'] = array(); if ($serendipity['production'] == 1) { error_reporting(E_ALL & ~E_NOTICE); --- serendipity_admin_css.inc.php DELETED --- Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.190 retrieving revision 1.191 diff -u -d -r1.190 -r1.191 --- NEWS 27 Jul 2004 17:16:43 -0000 1.190 +++ NEWS 28 Jul 2004 16:39:43 -0000 1.191 @@ -3,6 +3,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Removed {dbPrefix}css table, since it was not used for anything + (tomsommer) [DB Layout change - > 0.6.11] + * Redesign entry list (tomsommer) * Display subtitle (usually blogname) in <title> tags (tomsommer) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.372 retrieving revision 1.373 diff -u -d -r1.372 -r1.373 --- serendipity_functions.inc.php 28 Jul 2004 08:46:38 -0000 1.372 +++ serendipity_functions.inc.php 28 Jul 2004 16:39:47 -0000 1.373 @@ -121,7 +121,7 @@ $directories = array( (isset($serendipity['template']) ? $serendipity['template'] . '/' : ''), - 'default/' + $serendipity['defaultTemplate'] .'/' ); foreach ($directories as $directory) { @@ -131,6 +131,7 @@ return $serendipity[$key] . $templateFile; } } + return false; } function serendipity_fetchTemplates() { @@ -167,7 +168,7 @@ return $data; } -function serendipity_saveTemplateSelection($theme = 'default') { +function serendipity_saveTemplateSelection($theme) { serendipity_set_config_var('template', $theme); } @@ -185,7 +186,7 @@ $preview = ' '; } - if (serendipity_get_config_var('template', 'default') == $theme) { + if (serendipity_get_config_var('template', $serendipity['defaultTemplate']) == $theme) { $is_active = 'checked="checked"'; } else { $is_active = ''; Index: serendipity_functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- serendipity_functions_installer.inc.php 28 Jul 2004 08:27:45 -0000 1.26 +++ serendipity_functions_installer.inc.php 28 Jul 2004 16:39:47 -0000 1.27 @@ -571,11 +571,11 @@ include_once S9Y_INCLUDE_PATH . 'serendipity_functions_config.inc.php'; $serendipity['dbPrefix'] = $_POST['dbPrefix']; - serendipity_set_config_var('template', 'default'); - $text = serendipity_db_escape_string(@file_get_contents(S9Y_INCLUDE_PATH . 'serendipity.css')); - $query = "INSERT into {$_POST['dbPrefix']}css (name, data) values ('default', '$text')"; - return serendipity_db_query($query); + /* Set the default template */ + serendipity_set_config_var('template', $serendipity['defaultTemplate']); + + return true; } function serendipity_installFiles() { --- serendipity.css DELETED --- |
