Index: trunk/globals.php =================================================================== diff -u -r3534 -r3648 --- trunk/globals.php (.../globals.php) (revision 3534) +++ trunk/globals.php (.../globals.php) (revision 3648) @@ -1611,23 +1611,25 @@ static $import_scripts = Array(); if( count($import_scripts) == 0 ) { - $sql = 'SELECT * FROM '.GetTablePrefix().'ImportScripts ORDER BY is_id'; - $db =&GetADODBConnection(); + + $sql = 'SELECT imp.* , m.LoadOrder + FROM '.TABLE_PREFIX.'ImportScripts imp + LEFT JOIN '.TABLE_PREFIX.'Modules m ON m.Name = imp.is_Module + ORDER BY m.LoadOrder'; + + $db =& GetADODBConnection(); $rs = $db->Execute($sql); - if( $rs && $rs->RecordCount() > 0 ) - { - while(!$rs->EOF) - { + if ($rs && $rs->RecordCount() > 0) { + while (!$rs->EOF) { $rec =& $rs->fields; - $import_scripts[] = Array( 'label' => $rec['is_label'], 'url' => $rec['is_script'], + $import_scripts[ $rec['is_id'] ] = Array( 'label' => $rec['is_label'], 'url' => $rec['is_script'], 'enabled' => $rec['is_enabled'], 'field_prefix' => $rec['is_field_prefix'], 'id' => $rec['is_string_id'], 'required_fields' => $rec['is_requred_fields'], 'module' => strtolower($rec['is_Module']) ); $rs->MoveNext(); } } - else - { + else { $import_scripts = Array(); } }