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

Conflicts: include/poller.php
2013-01-20 14:17:09 +01:00
parent 7ab335c9d6 4e3d0018c6
commit cc9ce39e3f
741 changed files with 9987 additions and 5350 deletions
--- a/include/poller.php
+++ b/include/poller.php
@@ -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