Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/page.php

2 files changed, 27 insertions, 28 deletions

diff --git a/install/database.sql b/install/database.sql
index 3a05c28ec..ef79862c3 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -128,16 +128,6 @@ CREATE TABLE IF NOT EXISTS `cache` (
   PRIMARY KEY (`k`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `challenge` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `challenge` char(255) NOT NULL,
-  `dfrn-id` char(255) NOT NULL,
-  `expire` int(11) NOT NULL,
-  `type` char(255) NOT NULL,
-  `last_update` char(255) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `channel` (
   `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -573,6 +563,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
   `photo` char(255) NOT NULL,
   `date` datetime NOT NULL,
   `msg` mediumtext NOT NULL,
+  `aid` int(11) NOT NULL,
   `uid` int(11) NOT NULL,
   `link` char(255) NOT NULL,
   `parent` int(11) NOT NULL,
@@ -588,7 +579,8 @@ CREATE TABLE IF NOT EXISTS `notify` (
   KEY `hash` (`hash`),
   KEY `parent` (`parent`),
   KEY `link` (`link`),
-  KEY `otype` (`otype`)
+  KEY `otype` (`otype`),
+  KEY `aid` (`aid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `obj` (
@@ -775,22 +767,6 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
   KEY `expire` (`expire`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `queue` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `cid` int(11) NOT NULL,
-  `network` char(32) NOT NULL,
-  `created` datetime NOT NULL,
-  `last` datetime NOT NULL,
-  `content` mediumtext NOT NULL,
-  `batch` tinyint(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`),
-  KEY `cid` (`cid`),
-  KEY `network` (`network`),
-  KEY `created` (`created`),
-  KEY `last` (`last`),
-  KEY `batch` (`batch`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `register` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `hash` char(255) NOT NULL,
diff --git a/install/update.php b/install/update.php
index e1fd8c7a4..f498ec042 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1081 );
+define( 'UPDATE_VERSION' , 1084 );
 
 /**
  *
@@ -896,3 +896,26 @@ ADD INDEX ( `expires` ) ");
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 }
+
+function update_r1081() {
+	$r = q("DROP TABLE `queue` ");
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
+
+function update_r1082() {
+	$r = q("DROP TABLE `challenge` ");
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
+
+function update_r1083() {
+	$r = q("ALTER TABLE `notify` ADD `aid` INT NOT NULL AFTER `msg` ,
+ADD INDEX ( `aid` )");
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
+