All: Update plugins/disable-emojis from 1.5 to 1.7

Author: Krinkle

composer.json

@@ -10,7 +10,12 @@
 		"deps": [
 			"curl -O -q --output-dir themes/jquery/lib/typesense-minibar 'https://raw.githubusercontent.com/jquery/typesense-minibar/1.3.4/{typesense-minibar.css,typesense-minibar.js,LICENSE.txt}'",
 			"curl -q https://raw.githubusercontent.com/jquery/typesense-minibar/1.3.4/typesense-minibar-foot.css >> themes/jquery/lib/typesense-minibar/typesense-minibar.css",
-			"curl -O -q --output-dir plugins/memcached 'https://raw.githubusercontent.com/Automattic/wp-memcached/35e1ea16f6b8cb8a1e6fbca124e33a44db21fa74/{object-cache.php,readme.txt,LICENSE}'"
+
+			"curl -O -q --output-dir plugins/memcached 'https://raw.githubusercontent.com/Automattic/wp-memcached/35e1ea16f6b8cb8a1e6fbca124e33a44db21fa74/{object-cache.php,readme.txt,LICENSE}'",
+
+			"git rm -rf plugins/disable-emojis/",
+			"curl -s 'https://downloads.wordpress.org/plugin/disable-emojis.1.7.7.zip' | tar -xv -C plugins/",
+			"git add plugins/disable-emojis/"
 		]
 	}
 }

plugins/disable-emojis/composer.json

@@ -0,0 +1,12 @@
+{
+    "name": "ryanhellyer/disable-emojiis",
+    "description": "WordPress plugin which disables the WordPress emoji functionality. GDPR friendly.",
+    "type": "wordpress-plugin",
+    "license": "GPL-2.0",
+    "authors": [
+        {
+            "name": "ryanhellyer"
+        }
+    ],
+    "require": {}
+}

plugins/disable-emojis/disable-emojis.php

@@ -1,9 +1,9 @@
 <?php
 /*
-Plugin Name: Disable Emojis
+Plugin Name: Disable Emojis (GDPR friendly)
 Plugin URI: https://geek.hellyer.kiwi/plugins/disable-emojis/
-Description: Disable Emojis
-Version: 1.5.2
+Description: Disable Emojis (GDPR friendly)
+Version: 1.7.7
 Author: Ryan Hellyer
 Author URI: https://geek.hellyer.kiwi/
 License: GPL2
@@ -29,7 +29,7 @@
 
 
 /**
- * Disable the emoji's
+ * Disable the emojis.
  */
 function disable_emojis() {
 	remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
@@ -53,9 +53,9 @@ function disable_emojis() {
 function disable_emojis_tinymce( $plugins ) {
 	if ( is_array( $plugins ) ) {
 		return array_diff( $plugins, array( 'wpemoji' ) );
-	} else {
-		return array();
 	}
+
+	return array();
 }
 
 /**
@@ -66,11 +66,17 @@ function disable_emojis_tinymce( $plugins ) {
  * @return array                 Difference betwen the two arrays.
  */
 function disable_emojis_remove_dns_prefetch( $urls, $relation_type ) {
+
 	if ( 'dns-prefetch' == $relation_type ) {
-		/** This filter is documented in wp-includes/formatting.php */
-		$emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2/svg/' );
 
-		$urls = array_diff( $urls, array( $emoji_svg_url ) );
+		// Strip out any URLs referencing the WordPress.org emoji location
+		$emoji_svg_url_bit = 'https://s.w.org/images/core/emoji/';
+		foreach ( $urls as $key => $url ) {
+			if ( strpos( $url, $emoji_svg_url_bit ) !== false ) {
+				unset( $urls[$key] );
+			}
+		}
+
 	}
 
 	return $urls;

plugins/disable-emojis/readme.txt

@@ -1,21 +1,25 @@
-=== Disable Emojis ===
+=== Disable Emojis (GDPR friendly) ===
 Contributors: ryanhellyer
-Tags: emojis
+Tags: emojis, gdpr, disable
 Donate link: https://geek.hellyer.kiwi/donate/
-Requires at least: 4.2
-Tested up to: 4.7
-Stable tag: 1.5.2
+Requires at least: 4.8
+Tested up to: 6.8
+Stable tag: 1.7.7
 
 
-This plugin disables the new WordPress emoji functionality.
+This plugin disables the new WordPress emoji functionality. GDPR friendly.
 
 
 == Description ==
 
-This plugin disables the new WordPress emoji functionality.
+This plugin disables the new WordPress emoji functionality. GDPR friendly.
 
 
-Note: Emoticons will still work and emoji's will still work in browsers which have built in support for them. This plugin simply removes the extra code bloat used to add support for emoji's in older browswers.
+Note: Emoticons will still work and emojis will still work in browsers which have built in support for them. This plugin simply removes the extra code bloat used to add support for emojis in older browsers.
+
+= GDPR compliancy =
+
+This plugin does not do anything to make your site less GDPR compliant. It disables the DNS prefetching of emojis within WordPress, which should ensure improved privacy. To determine if your site is GDPR compliant, please seek legal advice. I have done my best to ensure the plugin is 100% GDPR compliant, but I am not a lawyer so can not guarantee anything ;)
 
 
 == Installation ==
@@ -31,6 +35,38 @@ Visit the <a href="https://geek.hellyer.kiwi/plugins/disable-emojis/">Disable Em
 
 == Changelog ==
 
+= 1.7.7 =
+* Confirmed support for newer WordPress versions.
+
+= 1.7.6 =
+* Confirmed support for newer WordPress versions.
+
+= 1.7.5 =
+* Added Composer support.
+
+= 1.7.4 =
+* Fixing typos.
+
+= 1.7.3 =
+* Unneeded version bump to shut the WordPress.org notice up.
+
+= 1.7.2 =
+* Subtle improvement to code cleanliness.
+* Improved documentation regarding GDPR issues.
+
+= 1.7.1 =
+* Added GDPR friendly label on advice from Ipstenu.
+
+= 1.7 =
+* Removed DNS prefetch URL again.
+* This time using simple string check rather than relying on internal WordPress filters.
+
+= 1.6 =
+* Removed DNS prefetch URL. Props to Aaron Queen for assisting with this.
+
+= 1.5.3 =
+* Catering to new DNS prefetch URL in version 4.7 of core
+
 = 1.5.2 =
 * Improved documentation.
 * Removed redundant dns prefetching. Thanks to <a href="http://blog.milandinic.com/">Milan Dinic</a> for the pull request.