Merge branch 'master' of https://github.com/friendica/red

1 files changed, 4 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index e2a168156..19d79941c 100755
--- a/boot.php
+++ b/boot.php
@@ -47,7 +47,7 @@ define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
 
-define ( 'DB_UPDATE_VERSION',       1101  );
+define ( 'DB_UPDATE_VERSION',       1102  );
 
 define ( 'EOL',                    '<br />' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -323,11 +323,10 @@ define ( 'POLL_OVERWRITE',       0x8000);  // If you vote twice remove the prior
 
 
 define ( 'UPDATE_FLAGS_UPDATED',  0x0001);
+define ( 'UPDATE_FLAGS_FORCED',   0x0002);
 define ( 'UPDATE_FLAGS_DELETED',  0x1000);
 
 
-
-
 /**
  * Maximum number of "people who like (or don't like) this"  that we will list by name
  */
@@ -528,6 +527,8 @@ define ( 'ITEM_MENTIONSME',      0x0400);
 define ( 'ITEM_NOCOMMENT',       0x0800);  // commenting/followups are disabled
 define ( 'ITEM_OBSCURED',        0x1000);  // bit-mangled to protect from casual browsing by site admin
 define ( 'ITEM_VERIFIED',        0x2000);  // Signature verification was successful
+define ( 'ITEM_RETAINED',        0x4000);  // We looked at this item once to decide whether or not to expire it, and decided not to. 
+										   // Don't make us evaluate this same item again. 
 /**
  *
  * Reverse the effect of magic_quotes_gpc if it is enabled.