From c3cef219faa15004d99dfced762eb4ef6236dd8a Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Sat, 19 Jul 2014 15:51:43 +1000
Subject: [PATCH] Bug fixes to settings page ordering

---
 modules/backend/ServiceProvider.php        | 6 +++---
 modules/cms/ServiceProvider.php            | 2 +-
 modules/system/ServiceProvider.php         | 4 ++--
 modules/system/classes/SettingsManager.php | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index 10ebed318..34aea94e1 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -82,7 +82,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'category'    => 'My Settings',
                     'icon'        => 'icon-code',
                     'url'         => Backend::URL('backend/editorpreferences'),
-                    'sort'        => 200,
+                    'order'       => 600,
                     'context'     => 'mysettings'
                 ],
                 'backend_preferences' => [
@@ -91,7 +91,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'category'    => 'My Settings',
                     'icon'        => 'icon-laptop',
                     'class'       => 'Backend\Models\BackendPreferences',
-                    'sort'        => 200,
+                    'order'       => 500,
                     'context'     => 'mysettings'
                 ],
                 'myaccount' => [
@@ -100,7 +100,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'category'    => 'My Settings',
                     'icon'        => 'icon-user',
                     'url'         => Backend::URL('backend/users/myaccount'),
-                    'sort'        => 200,
+                    'order'       => 400,
                     'context'     => 'mysettings'
                 ],
             ]);
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index 78557ac8b..ffa48de90 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -112,7 +112,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'category'    => 'CMS',
                     'icon'        => 'icon-picture-o',
                     'url'         => Backend::URL('cms/theme'),
-                    'sort'        => 200
+                    'order'       => 200
                 ]
             ]);
         });
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 430934ab3..05438b4b9 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -229,7 +229,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'category'    => 'System',
                     'icon'        => 'icon-envelope',
                     'class'       => 'System\Models\MailSettings',
-                    'sort'        => 100
+                    'order'       => 400,
                 ],
                 'mail_templates' => [
                     'label'       => 'system::lang.mail_templates.menu_label',
@@ -237,7 +237,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'category'    => 'System',
                     'icon'        => 'icon-envelope-square',
                     'url'         => Backend::url('system/mailtemplates'),
-                    'sort'        => 100
+                    'order'       => 400,
                 ],
             ]);
         });
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index 69f9b5a52..0b7201cfd 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -36,7 +36,7 @@ class SettingsManager
         'icon'        => null,
         'url'         => null,
         'permissions' => [],
-        'order'       => 100,
+        'order'       => 500,
         'context'     => 'system',
     ];