oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev3167, Fix newsfeed queries with multiple params

Browse source
This commit is contained in:
shortcutme 2017-12-12 23:46:05 +01:00
parent 8ab7d26cd1
commit acc734d22d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/Newsfeed/NewsfeedPlugin.py
View file

@ -52,8 +52,8 @@ class UiWebsocketPlugin(object):
s = time.time() s = time.time()
try: try:
query, params = query_set query_raw, params = query_set
query_parts = query.split("UNION") query_parts = query_raw.split("UNION")
for i, query_part in enumerate(query_parts): for i, query_part in enumerate(query_parts):
db_query = DbQuery(query_part) db_query = DbQuery(query_part)
if day_limit: if day_limit:
@ -67,7 +67,7 @@ class UiWebsocketPlugin(object):
if ":params" in query: if ":params" in query:
query = query.replace(":params", ",".join(["?"] * len(params))) 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: else:
res = site.storage.query(query + " ORDER BY date_added DESC LIMIT %s" % limit) res = site.storage.query(query + " ORDER BY date_added DESC LIMIT %s" % limit)

2
src/Config.py
View file

@ -10,7 +10,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.0" self.version = "0.6.0"
self.rev = 3165 self.rev = 3167
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"