Merge pull request #259 from djsilcock/djsilcock-patch-1

Whooshee breaks manage.py install

flaskbb/configs/default.py

@@ -172,6 +172,7 @@ class DefaultConfig(object):
     # Celery
     CELERY_BROKER_URL = 'redis://localhost:6379'
     CELERY_RESULT_BACKEND = 'redis://localhost:6379'
+    if not REDIS_ENABLED: CELERY_ALWAYS_EAGER=True
 
     # FlaskBB Settings
     # ------------------------------ #

flaskbb/utils/populate.py

@@ -8,6 +8,7 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
+from __future__ import unicode_literals
 from flaskbb.management.models import Setting, SettingsGroup
 from flaskbb.user.models import User, Group
 from flaskbb.forum.models import Post, Topic, Forum, Category

flaskbb/utils/search.py

@@ -65,7 +65,7 @@ class TopicWhoosheer(AbstractWhoosheer):
             topic_id=topic.id,
             title=topic.title,
             username=topic.username,
-            content=topic.first_post.content
+            content=getattr(topic.first_post,'content',None)
         )
 
     @classmethod
@@ -74,7 +74,7 @@ class TopicWhoosheer(AbstractWhoosheer):
             topic_id=topic.id,
             title=topic.title,
             username=topic.username,
-            content=topic.first_post.content
+            content=getattr(topic.first_post,'content',None)
         )
 
     @classmethod

manage.py

@@ -114,9 +114,9 @@ def create_admin(username=None, password=None, email=None):
     """Creates the admin user."""
 
     if not (username and password and email):
-        username = prompt("Username")
-        email = prompt("A valid email address")
-        password = prompt_pass("Password")
+        username = unicode(prompt("Username"))
+        email = unicode(prompt("A valid email address"))
+        password = unicode(prompt_pass("Password"))
 
     create_admin_user(username=username, password=password, email=email)