Merge pull request #866 from annando/master

API: reworked
This commit is contained in:
fabrixxm 2013-12-26 02:12:27 -08:00
commit 230ce659bd
5 changed files with 486 additions and 308 deletions

View file

@ -14,7 +14,7 @@ require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.2.1745' ); define ( 'FRIENDICA_VERSION', '3.2.1745' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1166 ); define ( 'DB_UPDATE_VERSION', 1167 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

View file

@ -1175,3 +1175,18 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- Table structure for table `unique_contacts`
--
CREATE TABLE IF NOT EXISTS `unique_contacts` (
`id` INT NOT NULL AUTO_INCREMENT,
`url` CHAR(255) NOT NULL,
`nick` CHAR(255) NOT NULL,
`name` CHAR(255) NOT NULL,
`avatar` CHAR(255) NOT NULL,
PRIMARY KEY (`id`),
KEY `url` (`url`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

File diff suppressed because it is too large Load diff

View file

@ -110,7 +110,7 @@ function api_content(&$a) {
return $o; return $o;
} }
echo api_call($a); echo api_call($a);
killme(); killme();
} }

View file

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1166 ); define( 'UPDATE_VERSION' , 1167 );
/** /**
* *
@ -1526,3 +1526,18 @@ function update_1165() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }
function update_1166() {
$r = q("CREATE TABLE IF NOT EXISTS `unique_contacts` (
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
`url` CHAR(255) NOT NULL,
`nick` CHAR(255) NOT NULL,
`name` CHAR(255) NOT NULL,
`avatar` CHAR(255) NOT NULL,
INDEX (`url`)
) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
if (!$r)
return UPDATE_FAILED;
return UPDATE_SUCCESS;
}