merge sandbox to trunk for 1.4.4.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/member/queries/getMemberList.xml

@@ -23,7 +23,7 @@
         </group>
     </conditions>
     <navigation>
-        <index var="sort_index" default="member_srl" order="sort_order" />
+        <index var="sort_index" default="list_order" order="sort_order" />
         <list_count var="list_count" default="20" />
         <page_count var="page_count" default="10" />
         <page var="page" default="1" />

modules/member/queries/getMemberListWithinGroup.xml

@@ -26,7 +26,7 @@
         </group>
     </conditions>
     <navigation>
-        <index var="sort_index" default="member.member_srl" order="sort_order" />
+        <index var="sort_index" default="member.list_order" order="sort_order" />
         <list_count var="list_count" default="20" />
         <page_count var="page_count" default="10" />
         <page var="page" default="1" />

modules/member/queries/insertMember.xml

@@ -25,5 +25,6 @@
         <column name="is_admin" var="is_admin" default="N" />
         <column name="description" var="description" />
         <column name="extra_vars" var="extra_vars" />
+        <column name="list_order" var="list_order" />
     </columns>
 </query>

modules/member/queries/updateAllChangePasswordDate.xml

@@ -5,4 +5,4 @@
     <columns>
         <column name="change_password_date" var="change_password_date" notnull="notnull" default="curdate()" />
     </columns>
-</query>
+</query>

modules/member/queries/updateMemberListOrderAll.xml

@@ -0,0 +1,8 @@
+<query id="updateMemberListOrderAll" action="update">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="list_order" notnull="notnull" var="list_order" default="multiply(-1)" />
+    </columns>
+</query>