Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 12:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	include/poller.php
This commit is contained in:
Michael - piratica.eu 2013-01-20 14:17:09 +01:00
commit cc9ce39e3f
741 changed files with 9987 additions and 5350 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/poller.php
View file

@ -62,6 +62,10 @@ function poller_run(&$argv, &$argc){
proc_run('php',"include/queue.php");
// run diaspora photo queue process in the background
proc_run('php',"include/dsprphotoq.php");
// expire any expired accounts
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0