[php-blog-cvs] serendipity/include plugin_internal.inc.php,1.23,1.24

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

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

Modified Files:
	plugin_internal.inc.php 
Log Message:
Use the same query like fetchEntries() so that sticky/private accounts will be used for highlighting calendar days.
Fixes bug #1145625


Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- plugin_internal.inc.php	27 Jan 2005 16:43:11 -0000	1.23
+++ plugin_internal.inc.php	22 Feb 2005 10:50:36 -0000	1.24
@@ -121,6 +121,14 @@
         // Find out about diary entries
         $add_query   = '';
         $base_query  = '';
+        $cond = array();
+        $cond['and']     = "WHERE e.timestamp  >= " . serendipity_serverOffsetHour($ts, true) . "
+                              AND e.timestamp  <= " . serendipity_serverOffsetHour($endts, true) . "
+                                  " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp  <= " . time() : '') . "
+                              AND e.isdraft     = 'false'";
+
+        serendipity_plugin_api::hook_event('frontend_fetchentries', $cond, array('noCache' => false, 'noSticky' => false));
+
         if (isset($serendipity['GET']['category'])) {
             $categoryid  = serendipity_db_escape_string($serendipity['GET']['category']);
 
@@ -131,10 +139,8 @@
                                   FROM {$serendipity['dbPrefix']}entries e,
                                        {$serendipity['dbPrefix']}category c,
                                        {$serendipity['dbPrefix']}entrycat ec
-                                 WHERE e.timestamp  >= " . serendipity_serverOffsetHour($ts, true) . "
-                                   AND e.timestamp  <= " . serendipity_serverOffsetHour($endts, true) . "
-                                   " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp  <= " . time() : '') . "
-                                   AND e.isdraft     = 'false'
+                                       {$cond['joins']}
+                                       {$cond['and']}
                                    AND e.id          = ec.entryid
                                    AND c.categoryid  = ec.categoryid
                                    AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
@@ -144,10 +150,8 @@
         if (!isset($querystring)) {
             $querystring = "SELECT id, timestamp
                               FROM {$serendipity['dbPrefix']}entries e
-                             WHERE e.timestamp >= " . serendipity_serverOffsetHour($ts, true) . "
-                               AND e.timestamp <= " . serendipity_serverOffsetHour($endts, true) . "
-                               " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . time() : '') . "
-                               AND e.isdraft = 'false'";
+                              {$cond['joins']}
+                              {$cond['and']}";
         }
 
         $rows = serendipity_db_query($querystring);