aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2021-01-23 14:04:42 +0100
committerMax Kostikov <max@kostikov.co>2021-01-23 14:04:42 +0100
commit30962dadbf6c4f4d099fca05a0e7b3261fb6b391 (patch)
treea74e7f4c1b8d117a457ffb646a47f88023d24fd6
parentfbbc53838c04e6b85ac24a65fcf0c9c5795fdef7 (diff)
parent33951dc1e4695bece701b85275d4c282c1936150 (diff)
downloadvolse-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
-rw-r--r--Zotlabs/Lib/Libzot.php3
-rw-r--r--Zotlabs/Update/_1241.php24
2 files changed, 25 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 */
diff --git a/Zotlabs/Update/_1241.php b/Zotlabs/Update/_1241.php
new file mode 100644
index 000000000..1b2024aad
--- /dev/null
+++ b/Zotlabs/Update/_1241.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1241 {
+
+ function run() {
+
+ q("START TRANSACTION");
+
+ // remove duplicated profile photos
+ $r = dbq("DELETE FROM photo WHERE imgscale IN (4, 5, 6) AND photo_usage = 0");
+
+ if($r) {
+ q("COMMIT");
+ return UPDATE_SUCCESS;
+ }
+
+ q("ROLLBACK");
+ return UPDATE_FAILED;
+
+ }
+
+}