Merge branch 'release/0.9.2'

[philo.git] / philo / models / __init__.py

diff --git a/philo/models/__init__.py b/philo/models/__init__.py
index 523f789..3942b84 100644 (file)
--- a/philo/models/__init__.py
+++ b/philo/models/__init__.py
@@ -1,12 +1,20 @@
+from django.conf import settings
+from django.contrib.auth.models import User, Group
+from django.contrib.sites.models import Site
+
 from philo.models.base import *
 from philo.models.collections import *
 from philo.models.nodes import *
 from philo.models.pages import *
-from django.contrib.auth.models import User, Group
-from django.contrib.sites.models import Site
 
 
 register_value_model(User)
 register_value_model(Group)
 register_value_model(Site)
-register_templatetags('philo.templatetags.embed')
\ No newline at end of file
+
+if 'philo' in settings.INSTALLED_APPS:
+       from django.template import add_to_builtins
+       add_to_builtins('philo.templatetags.embed')
+       add_to_builtins('philo.templatetags.containers')
+       add_to_builtins('philo.templatetags.collections')
+       add_to_builtins('philo.templatetags.nodes')
\ No newline at end of file