[php-blog-cvs] serendipity index.php,1.49.2.4,1.49.2.5 serendipity_genpage.inc.php,1.33.2.8,1.33.2.9

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

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

Modified Files:
      Tag: branch-smarty
	index.php serendipity_genpage.inc.php 
Log Message:
- Don't manipulate core configuration variables, like blogTitle


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.33.2.8
retrieving revision 1.33.2.9
diff -u -d -r1.33.2.8 -r1.33.2.9
--- serendipity_genpage.inc.php	19 Sep 2004 20:06:36 -0000	1.33.2.8
+++ serendipity_genpage.inc.php	30 Sep 2004 18:05:44 -0000	1.33.2.9
@@ -14,7 +14,6 @@
 
 $serendipity['smarty']->assign(
     array(
-        'head_title'                => htmlspecialchars($serendipity['blogTitle']) . (isset($serendipity['blogSubTitle']) ? ' - '. htmlspecialchars($serendipity['blogSubTitle']) : ''),
         'head_charset'              => LANG_CHARSET,
         'head_version'              => $serendipity['version'],
         'CONST'                     => get_defined_constants(),

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.4
retrieving revision 1.49.2.5
diff -u -d -r1.49.2.4 -r1.49.2.5
--- index.php	27 Sep 2004 12:13:49 -0000	1.49.2.4
+++ index.php	30 Sep 2004 18:05:44 -0000	1.49.2.5
@@ -1,5 +1,7 @@
 <?php # $Id$
 
+#apd_set_pprof_trace();
+
 function microtime_float()
 {
    list($usec, $sec) = explode(" ", microtime());
@@ -64,7 +66,8 @@
         $date = serendipity_formatTime(DATE_FORMAT_ENTRY, strtotime($range));
     }
 
-    $serendipity['blogSubTitle'] = sprintf(ENTRIES_FOR, $date);
+    $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
+
     ob_start();
     include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
     $data = ob_get_contents();
@@ -89,7 +92,8 @@
         $date = date('d/m/Y', strtotime($range));
     }
 
-    $serendipity['blogSubTitle'] = sprintf(ENTRIES_FOR, $date);
+    $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
+
     ob_start();
     include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
     $data = ob_get_contents();
@@ -135,8 +139,7 @@
     $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
     $title = $title[0];
 
-    $serendipity['blogSubTitle'] = $serendipity['blogTitle'];
-    $serendipity['blogTitle'] = $title;
+    $serendipity['smarty']->assign(array('head_title' => $title, 'head_subtitle' => $serendipity['blogTitle']));
 
     ob_start();
     include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
@@ -229,5 +232,6 @@
 $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath'));
 
 echo '<center style="color: red; font-size: large">Process complete in '. (microtime_float()-$time_start) .' ms</center>';
+# serendipity_plugin_api::register_default_plugins();
 /* vim: set sts=4 ts=4 expandtab : */
 ?>