harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php
This commit is contained in:
redmatrix
2015-10-19 16:18:04 -07:00
parent 9f424bb208 599a0c66b2
commit ea37882b95
11 changed files with 7711 additions and 7397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/schema_mysql.sql
View File

@@ -1134,6 +1134,7 @@ CREATE TABLE IF NOT EXISTS `site` (
`site_valid` smallint NOT NULL DEFAULT '0',
`site_dead` smallint NOT NULL DEFAULT '0',
`site_type` smallint NOT NULL DEFAULT '0',
`site_project` char(255) NOT NULL DEFAULT '',
PRIMARY KEY (`site_url`),
KEY `site_flags` (`site_flags`),
KEY `site_update` (`site_update`),
@@ -1145,7 +1146,8 @@ CREATE TABLE IF NOT EXISTS `site` (
KEY `site_realm` (`site_realm`),
KEY `site_valid` (`site_valid`),
KEY `site_dead` (`site_dead`),
KEY `site_type` (`site_type`)
KEY `site_type` (`site_type`),
KEY `site_project` (`site_project`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `source` (