Skip to content
Permalink
Browse files
rest_html5: don’t activate plugins twice
Since Nikola won’t load those plugins with the original `rest` plugin,
we can leave it to that. This hides warnings about shortcode name
conflicts.

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Jul 13, 2016
1 parent 78430c5 commit b1fcefbdeda49a0dfdb53f0d6d9c03cc54e38369
Showing with 0 additions and 8 deletions.
  1. +0 −8 v7/rest_html5/rest_html5.py
@@ -97,7 +97,6 @@ def compile_html(self, source, dest, is_two_file=True):
output, error_level, deps = rst2html(
data, settings_overrides={
'initial_header_level': 0,
# 'tab_width': 0,
'record_dependencies': True,
'stylesheet_path': None,
'link_stylesheet': True,
@@ -138,14 +137,7 @@ def create_post(self, path, **kw):
def set_site(self, site):
self.config_dependencies = []
for plugin_info in site.plugin_manager.getPluginsOfCategory("RestExtension"):
if plugin_info.name in site.config['DISABLED_PLUGINS']:
site.plugin_manager.removePluginFromCategory(plugin_info, "RestExtension")
continue

site.plugin_manager.activatePluginByName(plugin_info.name)
self.config_dependencies.append(plugin_info.name)
plugin_info.plugin_object.set_site(site)
plugin_info.plugin_object.short_help = plugin_info.description

self.logger = get_logger('compile_rest', site.loghandlers)
if not site.debug:

0 comments on commit b1fcefb

Please sign in to comment.