clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	boot.php
	update.php
This commit is contained in:
Michael Vogel
2014-09-04 02:29:12 +02:00
parent 56f0af2067 f17e6f534f
commit 24b3befc4d
4 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/dbstructure.php
View File

@@ -623,7 +623,7 @@ function db_definition() {
$database["guid"] = array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"guid" => array("type" => "varchar(64)", "not null" => "1"),
"guid" => array("type" => "varchar(255)", "not null" => "1"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@@ -664,7 +664,7 @@ function db_definition() {
$database["item"] = array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"guid" => array("type" => "varchar(64)", "not null" => "1"),
"guid" => array("type" => "varchar(255)", "not null" => "1"),
"uri" => array("type" => "varchar(255)", "not null" => "1"),
"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
"contact-id" => array("type" => "int(11)", "not null" => "1"),