[php-blog-cvs] r2645 - trunk/plugins/serendipity_plugin_recententries

[garvinhicking at B. <gar...@ma...>]

Author: garvinhicking
Date: 2010-03-13 09:45:30 +0100 (Sat, 13 Mar 2010)
New Revision: 2645

Modified:
   trunk/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php
Log:
SQL fix for duplucate alias


Modified: trunk/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php
===================================================================
--- trunk/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php	2010-03-11 09:14:42 UTC (rev 2644)
+++ trunk/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php	2010-03-13 08:45:30 UTC (rev 2645)
@@ -152,10 +152,6 @@
         $sql_condition['joins'] = '';
         $sql_condition['and']   = '';
 
-        $sql_condition['joins'] .= 
-            'LEFT OUTER JOIN ' . $serendipity['dbPrefix'] . 'entrycat AS ec ON id = ec.entryid
-             LEFT OUTER JOIN ' . $serendipity['dbPrefix'] . 'category AS c  ON ec.categoryid = c.categoryid';
-
         if ($category != 'none' && !empty($category)) {
                          
             $sql_categories = array();
@@ -203,6 +199,14 @@
         $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 ';
+        }
+
         $entries_query = "SELECT DISTINCT id,
                                 title,
                                 timestamp
@@ -213,6 +217,11 @@
                                 $sql_number";
         
         $entries = serendipity_db_query($entries_query);
+        
+        if (is_string($entries)) {
+            echo $entries . "<br />\n";
+            echo $entries_query . "<br />\n";
+        }
 
         if (isset($entries) && is_array($entries)) {
             echo '<dl>' . "\n";