diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | database.sql | 9 | ||||
| -rw-r--r-- | include/diaspora.php | 4 |
3 files changed, 12 insertions, 3 deletions
@@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDIKA_PLATFORM', 'Friendica'); define ( 'FRIENDIKA_VERSION', '2.3.1166' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1103 ); +define ( 'DB_UPDATE_VERSION', 1104 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 58b81b0ac..924cc49b2 100644 --- a/database.sql +++ b/database.sql @@ -113,7 +113,8 @@ CREATE TABLE IF NOT EXISTS `contact` ( KEY `issued-id` (`issued-id`), KEY `dfrn-id` (`dfrn-id`), KEY `blocked` (`blocked`), - KEY `readonly` (`readonly`) + KEY `readonly` (`readonly`), + KEY `pending` (`pending`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -245,8 +246,10 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `origin` (`origin`), KEY `last-child` (`last-child`), KEY `unseen` (`unseen`), + KEY `wall` (`wall`), FULLTEXT KEY `title` (`title`), FULLTEXT KEY `body` (`body`), + FULLTEXT KEY `tag` (`tag`), FULLTEXT KEY `allow_cid` (`allow_cid`), FULLTEXT KEY `allow_gid` (`allow_gid`), FULLTEXT KEY `deny_cid` (`deny_cid`), @@ -441,6 +444,10 @@ CREATE TABLE IF NOT EXISTS `user` ( PRIMARY KEY (`uid`), KEY `nickname` (`nickname`), KEY `account_expired` (`account_expired`), + KEY `hidewall` (`hidewall`), + KEY `blockwall` (`blockwall`), + KEY `blocked` (`blocked`), + KEY `verified` (`verified`), KEY `login_date` (`login_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/include/diaspora.php b/include/diaspora.php index ff0c0c0d7..36457655e 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -455,7 +455,9 @@ function diaspora_request($importer,$xml) { intval($importer['uid']) ); - if(count($self)) { + // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array + + if(count($self) && $contact['rel'] == CONTACT_IS_FOLLOWER) { $arr = array(); $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $importer['uid']); |