Merge pull request #1165 from imachug/dbquery

DbQuery and Newsfeed bug

plugins/Newsfeed/NewsfeedPlugin.py

@@ -105,7 +105,7 @@ class UiWebsocketPlugin(object):
             for name, query in feeds.iteritems():
                 try:
                     db_query = DbQuery(query)
-                    db_query.wheres.append("%s LIKE ? OR %s LIKE ?" % (db_query.fields["body"], db_query.fields["title"]))
+                    db_query.wheres.append("(%s LIKE ? OR %s LIKE ?)" % (db_query.fields["body"], db_query.fields["title"]))
                     db_query.parts["ORDER BY"] = "date_added DESC"
                     db_query.parts["LIMIT"] = "30"
 

src/Db/DbQuery.py

@@ -22,6 +22,8 @@ class DbQuery:
     def parseWheres(self, query_where):
         if " AND " in query_where:
             return query_where.split(" AND ")
+        elif query_where:
+            return [query_where]
         else:
             return []