From acc734d22d36bcd6cfd6de15baf4f7b32a0d7e2d Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 12 Dec 2017 23:46:05 +0100 Subject: [PATCH] Rev3167, Fix newsfeed queries with multiple params --- plugins/Newsfeed/NewsfeedPlugin.py | 6 +++--- src/Config.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/Newsfeed/NewsfeedPlugin.py b/plugins/Newsfeed/NewsfeedPlugin.py index 26129501..6a50f5f8 100644 --- a/plugins/Newsfeed/NewsfeedPlugin.py +++ b/plugins/Newsfeed/NewsfeedPlugin.py @@ -52,8 +52,8 @@ class UiWebsocketPlugin(object): s = time.time() try: - query, params = query_set - query_parts = query.split("UNION") + query_raw, params = query_set + query_parts = query_raw.split("UNION") for i, query_part in enumerate(query_parts): db_query = DbQuery(query_part) if day_limit: @@ -67,7 +67,7 @@ class UiWebsocketPlugin(object): if ":params" in query: query = query.replace(":params", ",".join(["?"] * len(params))) - res = site.storage.query(query + " ORDER BY date_added DESC LIMIT %s" % limit, params) + res = site.storage.query(query + " ORDER BY date_added DESC LIMIT %s" % limit, params * query_raw.count(":params")) else: res = site.storage.query(query + " ORDER BY date_added DESC LIMIT %s" % limit) diff --git a/src/Config.py b/src/Config.py index 46ebe15d..d5a7b847 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.0" - self.rev = 3165 + self.rev = 3167 self.argv = argv self.action = None self.config_file = "zeronet.conf"