diff options
author | Max Kostikov <max@kostikov.co> | 2021-01-23 13:07:09 +0000 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2021-01-23 13:07:09 +0000 |
commit | 03910453a98bacd32dc379dc71d99a93d146bae1 (patch) | |
tree | a74e7f4c1b8d117a457ffb646a47f88023d24fd6 /Zotlabs/Daemon/Cron.php | |
parent | 33951dc1e4695bece701b85275d4c282c1936150 (diff) | |
parent | 30962dadbf6c4f4d099fca05a0e7b3261fb6b391 (diff) | |
download | volse-hubzilla-03910453a98bacd32dc379dc71d99a93d146bae1.tar.gz volse-hubzilla-03910453a98bacd32dc379dc71d99a93d146bae1.tar.bz2 volse-hubzilla-03910453a98bacd32dc379dc71d99a93d146bae1.zip |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!3
Diffstat (limited to 'Zotlabs/Daemon/Cron.php')
-rw-r--r-- | Zotlabs/Daemon/Cron.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index cd7a710d3..2c0422ddd 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -201,7 +201,7 @@ class Cron { require_once('include/photo/photo_driver.php'); foreach ($r as $rr) { $photos = import_xchan_photo($rr['xchan_photo_l'], $rr['xchan_hash'], false, true); - $x = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' + q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", dbesc($photos[0]), dbesc($photos[1]), @@ -219,8 +219,6 @@ class Cron { if (!$disable_discover_tab) Master::Summon(array('Externals')); - $generation = 0; - $restart = false; if (($argc > 1) && ($argv[1] == 'restart')) { @@ -232,8 +230,6 @@ class Cron { reload_plugins(); - $d = datetime_convert(); - // TODO check to see if there are any cronhooks before wasting a process if (!$restart) |