Naming convention applied to language strings, new API function added:

[mailer.git] / inc / modules / admin / what-mem_add.php

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 90ca4a69ace15916d4743cf1e19c0c81255d2784..6986b682b8fed51829eb472377c3eea973d1e337 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -99,8 +99,8 @@ if (!isFormSent()) {
 
                // Load sub menus :)
                foreach ($menus as $key_main => $value_main) {
-                       $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `what` != '' ORDER BY `sort`",
-                       array($value_main), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `what` != '' ORDER BY `sort` ASC",
+                               array($value_main), __FILE__, __LINE__);
                        if (!SQL_HASZERONUMS($result)) {
                                // Initialize arrays
                                $menus[$value_main] = array();
@@ -143,8 +143,8 @@ if (!isFormSent()) {
                } // END - foreach
        } // END - if
 
-       $OUT = '<select class="admin_select" name="sort" size="1">
-      <option value="">{--IS_FIRST_MENU--}</option>';
+       $OUT = '<select class="form_select" name="sort" size="1">
+      <option value="">{--ADMIN_IS_FIRST_MENU--}</option>';
        foreach ($below as $key => $m) {
                if (is_array($m)) {
                        foreach ($m as $key2 => $m2) {
@@ -168,7 +168,7 @@ if (!isFormSent()) {
        $content['action_selection'] = adminAddMenuSelectionBox('member', 'action', 'menu');
 
        // Display form
-       loadTemplate('admin_member_add', false, $content);
+       loadTemplate('admin_add_member_menu', false, $content);
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {