diff options
| -rwxr-xr-x | boot.php | 4 | ||||
| -rwxr-xr-x | database.sql | 2 | ||||
| -rwxr-xr-x | include/items.php | 1 | ||||
| -rwxr-xr-x | update.php | 18 |
4 files changed, 22 insertions, 3 deletions
@@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1247' ); +define ( 'FRIENDICA_VERSION', '2.3.1248' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1120 ); +define ( 'DB_UPDATE_VERSION', 1121 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 8abaa5a93..0b03149e9 100755 --- a/database.sql +++ b/database.sql @@ -226,6 +226,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `pubmail` tinyint(1) NOT NULL DEFAULT '0', `moderated` 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', `bookmark` tinyint(1) NOT NULL DEFAULT '0', `unseen` tinyint(1) NOT NULL DEFAULT '1', @@ -247,6 +248,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `received` (`received`), KEY `moderated` (`moderated`), KEY `visible` (`visible`), + KEY `spam` (`spam`), KEY `starred` (`starred`), KEY `bookmark` (`bookmark`), KEY `deleted` (`deleted`), diff --git a/include/items.php b/include/items.php index 3c30e99aa..5e3f9a60a 100755 --- a/include/items.php +++ b/include/items.php @@ -985,6 +985,7 @@ function tag_deliver($uid,$item_id) { 'verb' => ACTIVITY_TAG, 'otype' => 'item' )); + if(! $community_page) return; diff --git a/update.php b/update.php index dc3cc0e56..9e3f22ef1 100755 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?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("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`) "); + +} |