diff options
| author | Max Kostikov <max@kostikov.co> | 2021-01-23 14:04:42 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2021-01-23 14:04:42 +0100 |
| commit | 30962dadbf6c4f4d099fca05a0e7b3261fb6b391 (patch) | |
| tree | a74e7f4c1b8d117a457ffb646a47f88023d24fd6 /Zotlabs/Lib | |
| parent | fbbc53838c04e6b85ac24a65fcf0c9c5795fdef7 (diff) | |
| parent | 33951dc1e4695bece701b85275d4c282c1936150 (diff) | |
| download | volse-hubzilla-30962dadbf6c4f4d099fca05a0e7b3261fb6b391.tar.gz volse-hubzilla-30962dadbf6c4f4d099fca05a0e7b3261fb6b391.tar.bz2 volse-hubzilla-30962dadbf6c4f4d099fca05a0e7b3261fb6b391.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Daemon/Cache_query.php
# include/contact_widgets.php
# include/taxonomy.php
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 8847f0975..150a6af03 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -667,9 +667,8 @@ class Libzot { $arr['connect_url'] = ''; if ($r) { - if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $r[0]['xchan_photo_date'] != $arr['photo']['updated']) { + if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $arr['photo']['updated'] > $r[0]['xchan_photo_date']) $import_photos = true; - } // if we import an entry from a site that's not ours and either or both of us is off the grid - hide the entry. /** @TODO: check if we're the same directory realm, which would mean we are allowed to see it */ |