From 6f77a66d1e9bd0f0ce5d407e613f03288244e8b3 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Sat, 13 Mar 2010 20:20:29 +0000
Subject: [PATCH] another bug bites the dust. hopefully.

---
 .../serendipity_plugin_recententries.php              | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php b/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php
index a2fbb4a6..62f2a0f9 100644
--- a/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php
+++ b/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php
@@ -21,7 +21,7 @@ class serendipity_plugin_recententries extends serendipity_plugin {
         $propbag->add('description',   PLUGIN_RECENTENTRIES_BLAHBLAH);
         $propbag->add('stackable',     true);
         $propbag->add('author',        'Christian Machmeier, Christian Brabandt, Judebert, Don Chambers');
-        $propbag->add('version',       '2.2');
+        $propbag->add('version',       '2.3');
         $propbag->add('requirements',  array(
             'serendipity' => '0.8',
             'smarty'      => '2.6.7',
@@ -199,12 +199,13 @@ class serendipity_plugin_recententries extends serendipity_plugin {
         $sql_condition['and'] .= "AND timestamp <= " . time();
         serendipity_ACL_SQL($sql_condition, $category == 'none');
 
-        if (!stristr($sql_condition['joins'], $serendipity['dbPrefix'] . 'entrycat')) {
-            $sql_condition['joins'] .= ' LEFT OUTER JOIN ' . $serendipity['dbPrefix'] . 'entrycat AS ec ON id = ec.entryid ';
-        }
 
         if (!stristr($sql_condition['joins'], $serendipity['dbPrefix'] . 'category')) {
-            $sql_condition['joins'] .= ' LEFT OUTER JOIN ' . $serendipity['dbPrefix'] . 'category AS c  ON ec.categoryid = c.categoryid ';
+            $sql_condition['joins'] = ' LEFT OUTER JOIN ' . $serendipity['dbPrefix'] . 'category AS c  ON ec.categoryid = c.categoryid ' . $sql_condition['joins'];
+        }
+
+        if (!stristr($sql_condition['joins'], $serendipity['dbPrefix'] . 'entrycat')) {
+            $sql_condition['joins'] = ' LEFT OUTER JOIN ' . $serendipity['dbPrefix'] . 'entrycat AS ec ON id = ec.entryid ' . $sql_condition['joins'];
         }
 
         $entries_query = "SELECT DISTINCT id,