php-blog-cvs

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
- Tweak
- return, Smarty will echo


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.27
retrieving revision 1.419.2.28
diff -u -d -r1.419.2.27 -r1.419.2.28
--- serendipity_functions.inc.php	22 Sep 2004 10:58:56 -0000	1.419.2.27
+++ serendipity_functions.inc.php	22 Sep 2004 12:15:50 -0000	1.419.2.28
@@ -2377,8 +2377,7 @@
             $locations[$i] = 'http' . (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $locations[$i];
         }
 
-        if (!empty($checked_locations[$locations[$i]])) {
-            // If the same link in an entry has been trackbacked already, don't try another time.
+        if ( isset($checked_locations[$locations[$i]]) ) {
             continue;
         }
 
@@ -3493,7 +3492,7 @@
 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']));
+    $output = &$serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
     $serendipity['smarty']->assign($block, $output);
 
     return $output;
@@ -3542,7 +3541,7 @@
         $smarty->trigger_error(__FUNCTION__ .": missing 'side' parameter");
         return;
     }
-    echo serendipity_plugin_api::generate_plugins($params['side']);
+    return serendipity_plugin_api::generate_plugins($params['side']);
 }
 
 function serendipity_smarty_formatTime($timestamp, $format) {