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
11 changed files with 7711 additions and 7397 deletions

View File

@@ -1125,6 +1125,7 @@ CREATE TABLE "site" (
"site_valid" smallint NOT NULL DEFAULT '0',
"site_dead" smallint NOT NULL DEFAULT '0',
"site_type" smallint NOT NULL DEFAULT '0',
"site_project" text NOT NULL DEFAULT '',
PRIMARY KEY ("site_url")
);
create index "site_flags" on site ("site_flags");
@@ -1137,6 +1138,7 @@ create index "site_realm" on site ("site_realm");
create index "site_valid" on site ("site_valid");
create index "site_dead" on site ("site_dead");
create index "site_type" on site ("site_type");
create index "site_project" on site ("site_project");
CREATE TABLE "source" (
"src_id" serial NOT NULL,