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

[Tom S. <tom...@us...>]

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

Modified Files:
	index.php 
Log Message:
- Unbreak archives
- Rename serendipity_smarty_assignDefaults() to serendipity_smarty_init()
- Add serendipity_smarty_init() where needed


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- index.php	19 Nov 2004 11:24:34 -0000	1.55
+++ index.php	20 Nov 2004 17:11:59 -0000	1.56
@@ -93,6 +93,8 @@
         }
     }
 
+    serendipity_smarty_init();
+
     $serendipity['range'] = array($ts, $te);
     $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
 
@@ -138,6 +140,8 @@
     serendipity_track_referrer($id);
     $track_referer = false;
 
+    serendipity_smarty_init();
+
     $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['id']     = $id;
 
@@ -180,6 +184,7 @@
     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)) {
@@ -189,6 +194,8 @@
            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];