merge 1.4.5

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8396 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-05-26 05:07:20 +00:00
parent 0fa007a938
commit d77165d263
16 changed files with 131 additions and 66 deletions

View file

@ -131,7 +131,11 @@
if(!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
// Add a column for image_mark (02/14/2009)
// Add a column for list_order (05/18/2011)
if(!$oDB->isColumnExists("member_group", "list_order")) return true;
// image_mark 추가 (2009. 02. 14)
if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
// Add c column for password expiration date
if(!$oDB->isColumnExists("member", "change_password_date")) return true;
@ -173,6 +177,13 @@
if($oDB->isIndexExists("member_group","uni_member_group_title")) {
$oDB->dropIndex("member_group","uni_member_group_title",true);
}
// Add a column(list_order) to "member_group" table (05/18/2011)
if (!$oDB->isColumnExists("member_group", "list_order")) {
$oDB->addColumn("member_group", "list_order", "number", 11, '', true);
$oDB->addIndex("member_group","idx_list_order", "list_order",false);
$output = executeQuery('member.updateAllMemberGroupListOrder');
}
// Add a column for image_mark (02/14/2009)
if(!$oDB->isColumnExists("member_group", "image_mark")) {
$oDB->addColumn("member_group", "image_mark", "text");
@ -198,7 +209,6 @@
executeQuery('member.updateMemberListOrderAll',$args);
executeQuery('member.updateMemberListOrderAll');
}
if(!$oDB->isIndexExists("member","idx_list_order")) {
$oDB->addIndex("member","idx_list_order", array("list_order"));
}