[php-blog-cvs] serendipity index.php,1.56,1.57

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

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

Modified Files:
	index.php 
Log Message:
* fix rss feed (thanks tom)
* call serendipity_smarty_init() in genpage.inc, that's safer&better if plugins (like event_staticpage from romulus) call page generation.
* propagate setting of title through serendipity vars, to that plugins can globally access it (missed that part, I already committed part of a fix for that last week)



Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- index.php	20 Nov 2004 17:11:59 -0000	1.56
+++ index.php	20 Nov 2004 19:26:43 -0000	1.57
@@ -93,10 +93,8 @@
         }
     }
 
-    serendipity_smarty_init();
-
     $serendipity['range'] = array($ts, $te);
-    $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
+    $serendipity['head_subtitle'] = sprintf(ENTRIES_FOR, $date);
 
     ob_start();
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
@@ -140,8 +138,6 @@
     serendipity_track_referrer($id);
     $track_referer = false;
 
-    serendipity_smarty_init();
-
     $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['id']     = $id;
 
@@ -184,7 +180,6 @@
     header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php");
     exit;
 } else if (preg_match(PAT_ARCHIVE, $uri)) {
-    serendipity_smarty_init();
     $serendipity['GET']['action'] = 'archives';
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
 } else if (preg_match(PAT_PLUGIN, $uri, $matches)) {
@@ -194,8 +189,6 @@
            preg_match('@/(index\.(php|html))?@', $uri) ||
            preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) {
 
-    serendipity_smarty_init();
-
     if (count($serendipity['GET']) == 2) {
         if (isset($matches) && is_array($matches) && isset($matches[1])) {
             $serendipity['GET']['category'] = $matches[1];