@@ -1,4 +1,5 @@ import operator +from django.forms.widgets import Media def get_plugins(request, obj): if not hasattr(obj, '_plugins_cache'): @@ -15,5 +16,9 @@ def get_plugin_media(request, plugin): def get_plugins_media(request, obj): if not hasattr(obj, '_plugins_media_cache'): plugins = get_plugins(request, obj) - obj._plugins_media_cache = reduce(operator.add, [get_plugin_media(request, plugin) for plugin in plugins]) + media_classes = [get_plugin_media(request, plugin) for plugin in plugins] + if media_classes: + obj._plugins_media_cache = reduce(operator.add, media_classes) + else: + obj._plugins_media_cache = Media() return obj._plugins_media_cache \ No newline at end of file cms/plugins/utils.py @@ -16,7 +16,7 @@ def render_plugins_for_context(placeholder_name, page, context_to_copy, theme=No context = copy.copy(context_to_copy) l = get_language_from_request(context['request']) request = context['request'] - plugins = [plugin for plugin in get_plugins(request, page) if plugin.placeholder == self.name] + plugins = [plugin for plugin in get_plugins(request, page) if plugin.placeholder == placeholder_name] if settings.CMS_PLACEHOLDER_CONF and placeholder_name in settings.CMS_PLACEHOLDER_CONF: if "extra_context" in settings.CMS_PLACEHOLDER_CONF[placeholder_name]: context.update(settings.CMS_PLACEHOLDER_CONF[placeholder_name]["extra_context"]) cms/utils/plugin.py 970e4d7e7429d1366a03a2fbfa43597b5b138d2d Oyvind Saltvik oyvind.saltvik@gmail.com http://github.com/fivethreeo/django-cms-2.0/commit/65f39bedad889cc58343dbc6b9e1373d44c8a0c0 65f39bedad889cc58343dbc6b9e1373d44c8a0c0 2009-10-30T05:48:41-07:00 2009-10-30T05:48:41-07:00 fixed some issues with no plugin media class d154d6ee539333821e258616608cf460ec690938 Oyvind Saltvik oyvind.saltvik@gmail.com