From e1d381ab91d46b377e0bf0c984ef1c5bbb80ff60 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 2 Feb 2015 15:32:30 +0100
Subject: [PATCH] Few fixes.

---
 modoboa/core/management/commands/load_initial_data.py | 6 ++++--
 modoboa/urls.py                                       | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modoboa/core/management/commands/load_initial_data.py b/modoboa/core/management/commands/load_initial_data.py
index 148c57cc6..341d3f376 100644
--- a/modoboa/core/management/commands/load_initial_data.py
+++ b/modoboa/core/management/commands/load_initial_data.py
@@ -8,7 +8,7 @@
 from django.contrib.auth.models import Group
 from django.core.management.base import BaseCommand
 
-from modoboa.core import PERMISSIONS
+from modoboa.core import load_core_settings, PERMISSIONS
 from modoboa.core.extensions import exts_pool
 from modoboa.core.models import User, ObjectAccess
 from modoboa.lib import events
@@ -24,6 +24,7 @@ class Command(BaseCommand, CloseConnectionMixin):
 
     def handle(self, *args, **options):
         """Command entry point."""
+        load_core_settings()
 
         if not User.objects.filter(is_superuser=True).count():
             admin = User(username="admin", is_superuser=True)
@@ -32,6 +33,8 @@ class Command(BaseCommand, CloseConnectionMixin):
             ObjectAccess.objects.create(
                 user=admin, content_object=admin, is_owner=True)
 
+        exts_pool.load_all()
+
         superadmin = User.objects.filter(is_superuser=True).first()
         groups = PERMISSIONS.keys() + [
             role[0] for role
@@ -47,7 +50,6 @@ class Command(BaseCommand, CloseConnectionMixin):
                 continue
             add_permissions_to_group(group, permissions)
 
-        exts_pool.load_all()
         for extname in exts_pool.extensions.keys():
             extension = exts_pool.get_extension(extname)
             extension.load_initial_data()
diff --git a/modoboa/urls.py b/modoboa/urls.py
index 2a4e3eef5..29c617ec2 100644
--- a/modoboa/urls.py
+++ b/modoboa/urls.py
@@ -18,12 +18,12 @@ urlpatterns = patterns(
 
 urlpatterns += patterns(
     '',
-    *events.raiseQueryEvent("ExtraUprefsRoutes")
+    *exts_pool.load_all()
 )
 
 urlpatterns += patterns(
     '',
-    *exts_pool.load_all()
+    *events.raiseQueryEvent("ExtraUprefsRoutes")
 )
 
 parameters.apply_to_django_settings()