Merge pull request #5862 from nupplaphil/rename_App_Methods

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

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index a3916ad973f0dce20230023247bab9feaa790937..bd34449729392f575ad53169dc1750cb590ce5ad 100644 (file)
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -120,6 +120,12 @@ class CronJobs
                // delete user records for recently removed accounts
                $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"]);
                while ($user = DBA::fetch($users)) {
+                       // Delete the contacts of this user
+                       $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
+                       if (DBA::isResult($self)) {
+                               DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
+                       }
+
                        DBA::delete('user', ['uid' => $user['uid']]);
                }
        }
@@ -151,14 +157,14 @@ class CronJobs
                clear_cache();
 
                // clear cache for photos
-               clear_cache($a->get_basepath(), $a->get_basepath() . "/photo");
+               clear_cache($a->getBasePath(), $a->getBasePath() . "/photo");
 
                // clear smarty cache
-               clear_cache($a->get_basepath() . "/view/smarty3/compiled", $a->get_basepath() . "/view/smarty3/compiled");
+               clear_cache($a->getBasePath() . "/view/smarty3/compiled", $a->getBasePath() . "/view/smarty3/compiled");
 
                // clear cache for image proxy
                if (!Config::get("system", "proxy_disabled")) {
-                       clear_cache($a->get_basepath(), $a->get_basepath() . "/proxy");
+                       clear_cache($a->getBasePath(), $a->getBasePath() . "/proxy");
 
                        $cachetime = Config::get('system', 'proxy_cache_time');
 
@@ -275,10 +281,6 @@ class CronJobs
                        }
                }
 
-               // Set the parent if it wasn't set. (Shouldn't happen - but does sometimes)
-               // This call is very "cheap" so we can do it at any time without a problem
-               q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0");
-
                // There was an issue where the nick vanishes from the contact table
                q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''");