[php-blog-cvs] serendipity/include functions_smarty.inc.php,1.3,1.4 genpage.inc.php,1.3,1.4

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

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

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


Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- functions_smarty.inc.php	19 Nov 2004 11:24:51 -0000	1.3
+++ functions_smarty.inc.php	20 Nov 2004 17:12:00 -0000	1.4
@@ -104,7 +104,7 @@
     return serendipity_printTrackbacks(serendipity_fetchTrackbacks($params['entry']));
 }
 
-function serendipity_smarty_assignDefaults($smartyvars = null) {
+function serendipity_smarty_init() {
     global $serendipity;
 
     if (!isset($serendipity['smarty'])) {
@@ -176,10 +176,6 @@
         )
     );
 
-    if (is_array($smartyvars)) {
-        $serendipity['smarty']->assign($smartyvars);
-    }
-
     return true;
 }
 

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/genpage.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- genpage.inc.php	19 Nov 2004 11:24:51 -0000	1.3
+++ genpage.inc.php	20 Nov 2004 17:12:00 -0000	1.4
@@ -3,8 +3,6 @@
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php');
 
-serendipity_smarty_assignDefaults();
-
 $serendipity['smarty']->assign(
     array(
         'leftSidebarElements'       => serendipity_plugin_api::count_plugins('left'),