Merge remote branch 'mike/master'

1 files changed, 21 insertions, 0 deletions

diff --git a/update.php b/update.php
index 1c243e6ee..bb4536ae9 100644
--- a/update.php
+++ b/update.php
@@ -423,3 +423,24 @@ function update_1045() {
 function update_1046() {
 	q("ALTER TABLE `item` ADD `attach` MEDIUMTEXT NOT NULL AFTER `tag` ");
 }
+
+function update_1047() {
+	q("ALTER TABLE `contact` ADD `writable` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `readonly` ");
+}
+
+function update_1048() {
+	q("UPDATE `contact` SET `writable` = 1 WHERE `network` = 'stat' AND `notify` != '' ");
+}
+
+function update_1049() {
+	q("CREATE TABLE `mailacct` (
+	`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`uid` INT NOT NULL,
+	`server` CHAR( 255 ) NOT NULL ,
+	`user` CHAR( 255 ) NOT NULL ,
+	`pass` CHAR( 255 ) NOT NULL ,
+	`reply_to` CHAR( 255 ) NOT NULL ,
+	`last_check` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'
+	) ENGINE = MYISAM ");
+}
+