aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Daemon/Cron.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-08-13 09:46:01 +0200
committerMario Vavti <mario@mariovavti.com>2019-08-13 09:46:01 +0200
commite8f3b7f8530c69045dcabffecab2f158d0b35214 (patch)
treee02872bbb9a7226f30f78a1784fae113431eceaa /Zotlabs/Daemon/Cron.php
parent892e9cd835612c8155bf3c15436137f94abbb667 (diff)
parente28341ca4beb1b746a5c17590f62c02cc8df49ba (diff)
downloadvolse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.tar.gz
volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.tar.bz2
volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.zip
Merge branch '4.4RC'4.4
Diffstat (limited to 'Zotlabs/Daemon/Cron.php')
-rw-r--r--Zotlabs/Daemon/Cron.php3
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]),