Fix to properly pass the theme name to onEnabled-plugins

plone · Mar 31, 2015 · f80b434 · f80b434
1 parent 1ed8a8b
commit f80b434
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/plone/app/theming/utils.py b/src/plone/app/theming/utils.py
@@ -167,7 +167,7 @@ def findContext(request):
     context = getattr(published, '__parent__', None)
     if context is not None:
         return context
-    
+
     for parent in request.PARENTS:
         if IContentish.providedBy(parent) or ISiteRoot.providedBy(parent):
             return parent
@@ -500,15 +500,17 @@ def applyTheme(theme):
                 plugin.onDisabled(currentTheme, pluginSettings[name],
                                   pluginSettings)
 
+        currentTheme = settings.currentTheme
         themeDirectory = queryResourceDirectory(
-            THEME_RESOURCE_NAME, settings.currentTheme)
+            THEME_RESOURCE_NAME, currentTheme)
         if themeDirectory is not None:
             plugins = getPlugins()
             pluginSettings = getPluginSettings(themeDirectory, plugins)
 
         if pluginSettings is not None:
             for name, plugin in plugins:
-                plugin.onEnabled(theme, pluginSettings[name], pluginSettings)
+                plugin.onEnabled(currentTheme, pluginSettings[name],
+                                 pluginSettings)
 
 
 def createThemeFromTemplate(title, description, baseOn='template'):