Merge branch 'master' into spam
This commit is contained in:
commit
03956cef33
2
boot.php
2
boot.php
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1243' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
||||
define ( 'DB_UPDATE_VERSION', 1119 );
|
||||
define ( 'DB_UPDATE_VERSION', 1120 );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1119 );
|
||||
define( 'UPDATE_VERSION' , 1120 );
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -1013,10 +1013,11 @@ INDEX ( `mid` )
|
|||
}
|
||||
|
||||
function update_1118() {
|
||||
q("ALTER TABLE `contact` ADD `closeness` TINYINT( 2 ) NOT NULL DEFAULT '99' AFTER `reason` , ADD INDEX (`closensss`) ");
|
||||
q("update contact set closeness = 0 where self = 1");
|
||||
// rolled forward
|
||||
}
|
||||
|
||||
function update_1119() {
|
||||
q("ALTER TABLE `contact` ADD `closeness` TINYINT( 2 ) NOT NULL DEFAULT '99' AFTER `reason` , ADD INDEX (`closeness`) ");
|
||||
q("update contact set closeness = 0 where self = 1");
|
||||
q("ALTER TABLE `item` ADD `spam` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `visible` , ADD INDEX (`spam`) ");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue