Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean

This commit is contained in:
Michael 2016-11-05 05:25:22 +00:00
commit 4b33573c20
23 changed files with 1581 additions and 1007 deletions

View file

@ -11,6 +11,7 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
}
require_once("boot.php");
require_once("include/photos.php");
function cron_run(&$argv, &$argc){
@ -155,8 +156,9 @@ function cron_run(&$argv, &$argc){
*/
function cron_update_photo_albums() {
$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
if (!dbm::is_result($r))
if (!dbm::is_result($r)) {
return;
}
foreach ($r AS $user) {
photo_albums($user['uid'], true);