diff options
author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
---|---|---|
committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
commit | b89d2d7580e40cd417defaffd2514b5eed38577d (patch) | |
tree | 78ba9004d87b994dd9a531b475fd51b940bf3dd8 /Zotlabs/Daemon/Cron.php | |
parent | 350e636e3d0a44323c69185555e89cc01a213aa2 (diff) | |
parent | 047dd31724f8da12c153b4a6f27dc5462f7b97e5 (diff) | |
download | volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.gz volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.bz2 volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.zip |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Daemon/Cron.php')
-rw-r--r-- | Zotlabs/Daemon/Cron.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index 8b6b42c8a..fe356bcbf 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -108,6 +108,7 @@ class Cron { $file = dbunescbin($rr['content']); if(is_file($file)) { @unlink($file); + @rmdir(dirname($file)); logger('info: deleted cached photo file ' . $file, LOGGER_DEBUG); } } @@ -187,7 +188,7 @@ class Cron { if($r) { require_once('include/photo/photo_driver.php'); foreach($r as $rr) { - $photos = import_xchan_photo($rr['xchan_photo_l'],$rr['xchan_hash']); + $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' where xchan_hash = '%s'", dbesc($photos[0]), |