Merge remote-tracking branch 'upstream/master'

2 files changed, 20 insertions, 4 deletions

diff --git a/install/database.sql b/install/database.sql
index 7dbaff7ea..c989439fa 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -160,7 +160,7 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_max_friend_req` int(10) unsigned NOT NULL DEFAULT '10',
   `channel_expire_days` int(11) NOT NULL DEFAULT '0',
   `channel_passwd_reset` char(255) NOT NULL DEFAULT '',
-  `channel_default_gid` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_default_group` char(255) NOT NULL DEFAULT '',
   `channel_allow_cid` mediumtext NOT NULL,
   `channel_allow_gid` mediumtext NOT NULL,
   `channel_deny_cid` mediumtext NOT NULL,
@@ -537,10 +537,10 @@ CREATE TABLE IF NOT EXISTS `mail` (
 CREATE TABLE IF NOT EXISTS `manage` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL,
-  `mid` int(11) NOT NULL,
+  `xchan` char(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
-  KEY `mid` (`mid`)
+  KEY `xchan` (`xchan`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `menu` (
diff --git a/install/update.php b/install/update.php
index 493a5478b..eb796ccf6 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1038 );
+define( 'UPDATE_VERSION' , 1040 );
 
 /**
  *
@@ -495,5 +495,21 @@ ADD INDEX `parent_mid` ( `parent_mid` ) ");
 }
 
 
+function update_r1038() {
+	$r = q("ALTER TABLE `manage` CHANGE `mid` `xchan` CHAR( 255 ) NOT NULL DEFAULT '', drop index `mid`,  ADD INDEX ( `xchan` )");
 
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}
+ 
+
+function update_r1039() {
+	$r = q("ALTER TABLE `channel` CHANGE `channel_default_gid` `channel_default_group` CHAR( 255 ) NOT NULL DEFAULT ''");
 
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}