Merge remote-tracking branch 'upstream/develop' into post-delivery-data

[friendica.git] / src / Worker / Directory.php

diff --git a/src/Worker/Directory.php b/src/Worker/Directory.php
index ff844ca39209df506abbeb4042f1402f223d51c4..6c6d26f26cc35fcaf3bc29d4d8ce6e864ecbcf99 100644 (file)
--- a/src/Worker/Directory.php
+++ b/src/Worker/Directory.php
@@ -61,16 +61,10 @@ class Directory
        }
 
        private static function updateAll() {
-               $r = q("SELECT `url` FROM `contact`
-                       INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
-                       INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-                               WHERE `contact`.`self` AND `profile`.`net-publish` AND
-                                       NOT `user`.`account_expired` AND `user`.`verified`");
-
-               if (DBA::isResult($r)) {
-                       foreach ($r AS $user) {
-                               Worker::add(PRIORITY_LOW, 'Directory', $user['url']);
-                       }
+               $users = DBA::select('owner-view', ['url'], ['net-publish' => true, 'account_expired' => false, 'verified' => true]);
+               while ($user = DBA::fetch($users)) {
+                       Worker::add(PRIORITY_LOW, 'Directory', $user['url']);
                }
+               DBA::close($users);
        }
 }