Index: trunk/core/units/phrases/phrases_config.php
===================================================================
diff -u -r4712 -r4743
--- trunk/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 4712)
+++ trunk/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 4743)
@@ -102,7 +102,7 @@
'LanguageId' => Array('type' => 'int','not_null' => '1','default' => '0'),
'LastChanged' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '0'),
'LastChangeIP' => Array('type' => 'string','not_null' => '1','default' => ''),
- 'Module' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules ORDER BY Name', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'),
+ 'Module' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'),
),
'VirtualFields' => Array(
Index: trunk/kernel/units/phrases/phrases_config.php
===================================================================
diff -u -r4712 -r4743
--- trunk/kernel/units/phrases/phrases_config.php (.../phrases_config.php) (revision 4712)
+++ trunk/kernel/units/phrases/phrases_config.php (.../phrases_config.php) (revision 4743)
@@ -102,7 +102,7 @@
'LanguageId' => Array('type' => 'int','not_null' => '1','default' => '0'),
'LastChanged' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '0'),
'LastChangeIP' => Array('type' => 'string','not_null' => '1','default' => ''),
- 'Module' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules ORDER BY Name', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'),
+ 'Module' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'),
),
'VirtualFields' => Array(
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -r4712 -r4743
--- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 4712)
+++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 4743)
@@ -154,7 +154,6 @@
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tbGluayBvdXRwdXQgc2V0dGluZ3M=
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2Ugc2VhcmNoIHNldHRpbmdzIGFuZCBmaWVsZHM=
SW4tTGluayBHZW5lcmFsIENvbmZpZ3VyYXRpb24gT3B0aW9ucw==
- VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgcGFpZCBsaXN0aW5ncw==
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBydW4gdmFsaWRhdGlvbiBvbiB0aGUgbGlua3M=
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tbmV3eiBzZXR0aW5ncw==
VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tbmV3eiBjdXN0b20gZmllbGRz
@@ -928,6 +927,7 @@
Q2F0ZWdvcnkgU2VsZWN0
Q2Vuc29yc2hpcA==
Q29tbXVuaXR5
+ R2VuZXJhbCBTZXR0aW5ncw==
Q2Vuc29yc2hpcA==
Q3VzdG9tIEZpZWxkcw==
RS1tYWlsIFNldHRpbmdz
@@ -936,6 +936,7 @@
U2VhcmNoIFNldHRpbmdz
R2VuZXJhbCBTZXR0aW5ncw==
U21pbGV5cw==
+ R2VuZXJhbCBTZXR0aW5ncw==
Q3VzdG9t
RW1haWwgRXZlbnRz
RW1haWwgTG9n