mirror of
https://github.com/friendica/friendica
synced 2024-12-22 23:20:16 +00:00
db installation sync
This commit is contained in:
parent
b346f4464c
commit
d79c3351ea
4 changed files with 22 additions and 3 deletions
4
boot.php
4
boot.php
|
@ -9,9 +9,9 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '2.3.1247' );
|
define ( 'FRIENDICA_VERSION', '2.3.1248' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1120 );
|
define ( 'DB_UPDATE_VERSION', 1121 );
|
||||||
|
|
||||||
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' );
|
||||||
|
|
|
@ -226,6 +226,7 @@ CREATE TABLE IF NOT EXISTS `item` (
|
||||||
`pubmail` tinyint(1) NOT NULL DEFAULT '0',
|
`pubmail` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`moderated` tinyint(1) NOT NULL DEFAULT '0',
|
`moderated` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`visible` tinyint(1) NOT NULL DEFAULT '0',
|
`visible` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
|
`spam` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`starred` tinyint(1) NOT NULL DEFAULT '0',
|
`starred` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`bookmark` tinyint(1) NOT NULL DEFAULT '0',
|
`bookmark` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`unseen` tinyint(1) NOT NULL DEFAULT '1',
|
`unseen` tinyint(1) NOT NULL DEFAULT '1',
|
||||||
|
@ -247,6 +248,7 @@ CREATE TABLE IF NOT EXISTS `item` (
|
||||||
KEY `received` (`received`),
|
KEY `received` (`received`),
|
||||||
KEY `moderated` (`moderated`),
|
KEY `moderated` (`moderated`),
|
||||||
KEY `visible` (`visible`),
|
KEY `visible` (`visible`),
|
||||||
|
KEY `spam` (`spam`),
|
||||||
KEY `starred` (`starred`),
|
KEY `starred` (`starred`),
|
||||||
KEY `bookmark` (`bookmark`),
|
KEY `bookmark` (`bookmark`),
|
||||||
KEY `deleted` (`deleted`),
|
KEY `deleted` (`deleted`),
|
||||||
|
|
|
@ -985,6 +985,7 @@ function tag_deliver($uid,$item_id) {
|
||||||
'verb' => ACTIVITY_TAG,
|
'verb' => ACTIVITY_TAG,
|
||||||
'otype' => 'item'
|
'otype' => 'item'
|
||||||
));
|
));
|
||||||
|
|
||||||
if(! $community_page)
|
if(! $community_page)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
18
update.php
18
update.php
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
define( 'UPDATE_VERSION' , 1120 );
|
define( 'UPDATE_VERSION' , 1121 );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -1021,3 +1021,19 @@ q("ALTER TABLE `contact` ADD `closeness` TINYINT( 2 ) NOT NULL DEFAULT '99' AFTE
|
||||||
q("update contact set closeness = 0 where self = 1");
|
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`) ");
|
q("ALTER TABLE `item` ADD `spam` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `visible` , ADD INDEX (`spam`) ");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function update_1120() {
|
||||||
|
|
||||||
|
// item table update from 1119 did not get into database.sql file.
|
||||||
|
// might be missing on new installs. We'll check.
|
||||||
|
|
||||||
|
$r = q("describe item");
|
||||||
|
if($r && count($r)) {
|
||||||
|
foreach($r as $rr)
|
||||||
|
if($rr['Field'] == 'spam')
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
q("ALTER TABLE `item` ADD `spam` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `visible` , ADD INDEX (`spam`) ");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue