Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private...

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index 925bb5eab5c26a9f3d2a525af8cbd15f65185d43..c92396dc7a446ce256e66f7e46d5d38d924c7a77 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -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);
@@ -323,7 +325,7 @@ function cron_poll_contacts($argc, $argv) {
 
                        logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
 
-                       if ($contact["remote_self"]) {
+                       if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) {
                                proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', $contact['id']);
                        } else {
                                proc_run(PRIORITY_LOW, 'include/onepoll.php', $contact['id']);