Permalink
Browse files

Fixed #983

  • Loading branch information...
1 parent bed549c commit 7e0a36dd17a3598ced1a2c2afa315528b4470cb5 Jonas Obrist committed Sep 2, 2011
Showing with 5 additions and 1 deletion.
  1. +5 −1 cms/plugin_pool.py
View
@@ -77,10 +77,14 @@ def get_all_plugins(self, placeholder=None, page=None, setting_key="plugins", in
plugins = self.plugins.values()[:]
plugins.sort(key=lambda obj: unicode(obj.name))
final_plugins = []
+ if page:
+ template = page.get_template()
+ else:
+ template = None
allowed_plugins = get_placeholder_conf(
setting_key,
placeholder,
- getattr(page, 'template', None)
+ template,
)
for plugin in plugins:
include_plugin = False

0 comments on commit 7e0a36d

Please sign in to comment.