[php-blog-cvs] serendipity/plugins/serendipity_event_entryproperties serendipity_event_entryproperties.php,1.3,1.4

[Garvin H. <gar...@us...>]

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

Modified Files:
	serendipity_event_entryproperties.php 
Log Message:
* fix rss feed (thanks tom)
* call serendipity_smarty_init() in genpage.inc, that's safer&better if plugins (like event_staticpage from romulus) call page generation.
* propagate setting of title through serendipity vars, to that plugins can globally access it (missed that part, I already committed part of a fix for that last week)



Index: serendipity_event_entryproperties.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_entryproperties.php	19 Nov 2004 11:24:54 -0000	1.3
+++ serendipity_event_entryproperties.php	20 Nov 2004 19:26:44 -0000	1.4
@@ -309,6 +309,8 @@
                     $conds = array();
                     if (!isset($addData['noSticky']) || $addData['noSticky'] !== true) {
                         $conds[] = 'ep_sticky.value IS NULL AS orderkey,';
+                    } else {
+                        $conds[] = '1 AS orderkey,';
                     }
 
                     if ($is_cache && (!isset($addData['noCache']) || !$addData['noCache'])) {
@@ -316,10 +318,6 @@
                         $conds[] = 'ep_cache_body.value     AS ep_cache_body,';
                     }
 
-                    if (count($conds) < 1) {
-                        $conds[] = '1 AS orderkey,';
-                    }
-
                     $cond = implode("\n", $conds);
                     if (empty($eventData['addkey'])) {
                         $eventData['addkey'] = $cond;