Merge branch 'master' into spam

This commit is contained in:
friendica 2012-02-04 22:26:51 -08:00
commit a8163a6eaf
2 changed files with 3 additions and 3 deletions

View file

@ -9,7 +9,7 @@ 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.1242' ); define ( 'FRIENDICA_VERSION', '2.3.1243' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1119 ); define ( 'DB_UPDATE_VERSION', 1119 );

View file

@ -29,10 +29,10 @@ function expire_run($argv, $argc){
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));
// physically remove anything that has been deleted from more than two months // physically remove anything that has been deleted for more than two months
$r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY"); $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY");
q("optimize table item");
logger('expire: start'); logger('expire: start');