Permalink
Browse files

Merge branch 'release/0.6.1'

  • Loading branch information...
2 parents 6f661db + a546bd8 commit 53885c5280b8f77df86509d70be3350fba8f3ccf @piquadrat committed Aug 23, 2012
Showing with 6 additions and 3 deletions.
  1. +1 −1 cms_search/__init__.py
  2. +3 −0 cms_search/search_indexes.py
  3. +2 −2 metadata.py
@@ -1 +1 @@
-__version__ = '0.6'
+__version__ = '0.6.1'
@@ -70,6 +70,9 @@ def prepare(self, obj):
text = u''
for base_plugin in plugins:
instance, plugin_type = base_plugin.get_plugin_instance()
+ if instance is None:
+ # this is an empty plugin
+ continue
if hasattr(instance, 'search_fields'):
text += u' '.join(force_unicode(_strip_tags(getattr(instance, field, ''))) for field in instance.search_fields)
if getattr(instance, 'search_fulltext', False) or getattr(plugin_type, 'search_fulltext', False):
View
@@ -1,7 +1,7 @@
package_name = 'cms_search'
name = 'django-cms-search'
-author = 'Divio AG'
-author_email = 'developers@divio.ch'
+author = 'Benjamin Wohlwend'
+author_email = 'piquadrat@gmail.com'
description = "An extension to django CMS to provide multilingual Haystack indexes"
version = __import__(package_name).__version__
project_url = 'http://github.com/piquadrat/%s' % name

0 comments on commit 53885c5

Please sign in to comment.