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

Rev1704, FIx siteSign error

Browse source
This commit is contained in:
shortcutme 2016-11-11 23:12:32 +01:00
parent 43e9044ef7
commit c82c61ef3d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/MergerSite/MergerSitePlugin.py
View file

@ -287,6 +287,8 @@ class SiteManagerPlugin(object):
merged_db = {} merged_db = {}
merged_to_merger = {} merged_to_merger = {}
site_manager = self site_manager = self
if not self.sites:
return
for site in self.sites.itervalues(): for site in self.sites.itervalues():
# Update merged sites # Update merged sites
merged_type = site.content_manager.contents.get("content.json", {}).get("merged_type") merged_type = site.content_manager.contents.get("content.json", {}).get("merged_type")

2
src/Config.py
View file

@ -8,7 +8,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.5.0" self.version = "0.5.0"
self.rev = 1703 self.rev = 1704
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"