From 3f57237b88688f956add02bc18cd4642082fb526 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Thu, 24 Mar 2011 08:50:18 +0100
Subject: [PATCH] make getPopularTags a tiny bit easier

---
 src/SemanticScuttle/Service/Bookmark2Tag.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php
index 83a8aed..b69cfd4 100644
--- a/src/SemanticScuttle/Service/Bookmark2Tag.php
+++ b/src/SemanticScuttle/Service/Bookmark2Tag.php
@@ -550,14 +550,6 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
             $privacy = '';
         }
 
-        if (is_null($days) || !is_int($days)) {
-            $span = '';
-        } else {
-            $span = ' AND B.bDatetime > "'
-                . date('Y-m-d H:i:s', time() - (86400 * $days))
-                . '"';
-        }
-
         $query = 'SELECT'
             . ' T.tag, COUNT(T.bId) AS bCount'
             . ' FROM '
@@ -579,7 +571,13 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
                 . ' AND B.bId = T.bId' . $privacy;
         }
 
-        $query .= $span . ' AND LEFT(T.tag, 7) <> "system:"'
+        if (is_int($days)) {
+            $query .= ' AND B.bDatetime > "'
+                . date('Y-m-d H:i:s', time() - (86400 * $days))
+                . '"';
+        }
+
+        $query .= ' AND LEFT(T.tag, 7) <> "system:"'
             . ' GROUP BY T.tag'
             . ' ORDER BY bCount DESC, tag';