Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18386/include
Modified Files:
functions_entries.inc.php functions_smarty.inc.php
Log Message:
* fix output of DOCTYPE header in embedded mode to be placed right
* some more return by reference optimising
* unbreak comment moderation
* fix generic rss import when no categories have been created
Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- functions_smarty.inc.php 23 Nov 2004 12:24:32 -0000 1.8
+++ functions_smarty.inc.php 1 Dec 2004 11:00:55 -0000 1.9
@@ -1,6 +1,6 @@
<?php # $Id$
-function serendipity_smarty_fetch($block, $file, $echo = false) {
+function &serendipity_smarty_fetch($block, $file, $echo = false) {
global $serendipity;
$output = $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
@@ -66,7 +66,7 @@
}
}
-function serendipity_smarty_printComments($params, &$smarty) {
+function &serendipity_smarty_printComments($params, &$smarty) {
global $serendipity;
if (!isset($params['entry'])) {
Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- functions_entries.inc.php 30 Nov 2004 13:28:02 -0000 1.16
+++ functions_entries.inc.php 1 Dec 2004 11:00:55 -0000 1.17
@@ -379,7 +379,6 @@
LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a
ON c.authorid = a.authorid $where
ORDER BY category_name";
-
return serendipity_db_query($querystring);
}
|
