Merge branch 'dev' into 'dev'

# Conflicts:
#   Zotlabs/Daemon/Cache_query.php
#   include/contact_widgets.php
#   include/taxonomy.php

1 files changed, 24 insertions, 0 deletions

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;
+
+	}
+
+}