From 8b539b3226e4f6aaa0ff0a91075ca9809b6fd022 Mon Sep 17 00:00:00 2001
From: Yann Kozon <contact@yannkozon.com>
Date: Sun, 16 Dec 2018 14:44:03 +0100
Subject: [PATCH] =?UTF-8?q?Compatibilit=C3=A9=20WordPress=205.0=20et=20PHP?=
 =?UTF-8?q?=207.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 disable-feed-comments.php           | 16 +++++++++++++++
 disable-feed.php                    |  4 +---
 disable-rest-api.php                | 30 +++++++++++++++--------------
 remove-login-error.php              |  2 +-
 remove-recaptcha-frontend-itsec.php | 17 ----------------
 remove-wp-embed.php                 | 12 +++++-------
 remove-wp-version.php               |  6 +-----
 7 files changed, 40 insertions(+), 47 deletions(-)
 create mode 100644 disable-feed-comments.php
 delete mode 100644 remove-recaptcha-frontend-itsec.php

diff --git a/disable-feed-comments.php b/disable-feed-comments.php
new file mode 100644
index 0000000..7153e0e
--- /dev/null
+++ b/disable-feed-comments.php
@@ -0,0 +1,16 @@
+<?php
+defined('ABSPATH') or die();
+
+/*
+MU Plugin: disable-feed-comments
+Description: Disable feed comments - RSS, Atom...
+Author: Yann Kozon
+Author URI: https://www.yannkozon.com
+*/
+
+function mu_disable_feed_comments() {  
+	wp_redirect( esc_url( home_url( '/' ) ), 301 );
+	die();
+}
+add_action( 'do_feed_rss2_comments', 'mu_disable_feed_comments' );
+add_action( 'do_feed_atom_comments', 'mu_disable_feed_comments' );
\ No newline at end of file
diff --git a/disable-feed.php b/disable-feed.php
index 312d19c..26bdb42 100644
--- a/disable-feed.php
+++ b/disable-feed.php
@@ -16,6 +16,4 @@ function mu_disable_feed() {
 add_action( 'do_feed_rdf', 'mu_disable_feed' );
 add_action( 'do_feed_rss', 'mu_disable_feed' );
 add_action( 'do_feed_rss2', 'mu_disable_feed' );
-add_action( 'do_feed_atom', 'mu_disable_feed' );
-add_action( 'do_feed_rss2_comments', 'mu_disable_feed' );
-add_action( 'do_feed_atom_comments', 'mu_disable_feed' );
\ No newline at end of file
+add_action( 'do_feed_atom', 'mu_disable_feed' );
\ No newline at end of file
diff --git a/disable-rest-api.php b/disable-rest-api.php
index f838144..4444864 100644
--- a/disable-rest-api.php
+++ b/disable-rest-api.php
@@ -8,21 +8,23 @@
 Author URI: https://www.yannkozon.com
 */
 
-function mu_disable_rest_api( ) {
-    remove_action( 'init',          'rest_api_init' );
-	remove_action( 'parse_request', 'rest_api_loaded' );
+function mu_disable_rest_api() {
+	if( ! is_user_logged_in() ) {
+	    remove_action( 'init',          'rest_api_init' );
+		remove_action( 'parse_request', 'rest_api_loaded' );
 
-	remove_action( 'xmlrpc_rsd_apis',            'rest_output_rsd' );
-	remove_action( 'wp_head',                    'rest_output_link_wp_head' );
-	remove_action( 'template_redirect',          'rest_output_link_header', 11 );
-	remove_action( 'auth_cookie_malformed',      'rest_cookie_collect_status' );
-	remove_action( 'auth_cookie_expired',        'rest_cookie_collect_status' );
-	remove_action( 'auth_cookie_bad_username',   'rest_cookie_collect_status' );
-	remove_action( 'auth_cookie_bad_hash',       'rest_cookie_collect_status' );
-	remove_action( 'auth_cookie_valid',          'rest_cookie_collect_status' );
+		remove_action( 'xmlrpc_rsd_apis',            'rest_output_rsd' );
+		remove_action( 'wp_head',                    'rest_output_link_wp_head' );
+		remove_action( 'template_redirect',          'rest_output_link_header', 11 );
+		remove_action( 'auth_cookie_malformed',      'rest_cookie_collect_status' );
+		remove_action( 'auth_cookie_expired',        'rest_cookie_collect_status' );
+		remove_action( 'auth_cookie_bad_username',   'rest_cookie_collect_status' );
+		remove_action( 'auth_cookie_bad_hash',       'rest_cookie_collect_status' );
+		remove_action( 'auth_cookie_valid',          'rest_cookie_collect_status' );
 
-	add_filter( 'rest_enabled',       '__return_false' );
-	add_filter( 'rest_jsonp_enabled', '__return_false' );
+		add_filter( 'rest_enabled',       '__return_false' );
+		add_filter( 'rest_jsonp_enabled', '__return_false' );
+	}
 }
 
-mu_disable_rest_api();
\ No newline at end of file
+add_action( 'init', 'mu_disable_rest_api' );
\ No newline at end of file
diff --git a/remove-login-error.php b/remove-login-error.php
index 96e311e..9e0a4dc 100644
--- a/remove-login-error.php
+++ b/remove-login-error.php
@@ -8,4 +8,4 @@
 Author URI: https://www.yannkozon.com
 */
 
-add_filter( 'login_errors', create_function( '$a', "return null;" ) );
\ No newline at end of file
+add_filter( 'login_errors', '__return_null' );
\ No newline at end of file
diff --git a/remove-recaptcha-frontend-itsec.php b/remove-recaptcha-frontend-itsec.php
deleted file mode 100644
index a2349db..0000000
--- a/remove-recaptcha-frontend-itsec.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-defined('ABSPATH') or die();
-
-/*
-MU Plugin: remove-recaptcha-frontend-itsec
-Description: Remove recaptcha in frontend theme if you use Google reCAPTCHA with iThemes security pro
-Author: Yann Kozon
-Author URI: https://www.yannkozon.com
-*/
-
-function mu_remove_recaptcha_frontend_itsec() {
-    if( ! in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) ) {
-    	wp_dequeue_script( 'google-recaptcha' );
-   		wp_dequeue_script( 'itsec-recaptcha' );
-    }
-}
-add_action( 'wp_enqueue_scripts', 'mu_remove_recaptcha_frontend_itsec', 999 );
\ No newline at end of file
diff --git a/remove-wp-embed.php b/remove-wp-embed.php
index a218ed9..19fecee 100644
--- a/remove-wp-embed.php
+++ b/remove-wp-embed.php
@@ -8,13 +8,11 @@
 Author URI: https://www.yannkozon.com
 */
 
-remove_action( 'wp_head', 'rest_output_link_wp_head' );
-remove_action( 'wp_head', 'wp_oembed_add_discovery_links' );
-remove_action( 'template_redirect', 'rest_output_link_header', 11, 0 );
-
 function mu_remove_wp_embed() {
-	wp_deregister_script( 'wp-embed.min.js' );
-	wp_deregister_script( 'wp-embed' );
-	wp_deregister_script( 'embed' );
+	if( ! is_admin() ) {
+		wp_deregister_script( 'wp-embed.min.js' );
+		wp_deregister_script( 'wp-embed' );
+		wp_deregister_script( 'embed' );
+	}
 }
 add_action( 'init', 'mu_remove_wp_embed', 9999 );
\ No newline at end of file
diff --git a/remove-wp-version.php b/remove-wp-version.php
index 315a356..8351b21 100644
--- a/remove-wp-version.php
+++ b/remove-wp-version.php
@@ -9,8 +9,4 @@
 */
 
 remove_action( 'wp_head', 'wp_generator' );
-
-function mu_remove_wp_version() {
-	return '';
-}
-add_filter( 'the_generator', 'mu_remove_wp_version' );
\ No newline at end of file
+add_filter( 'the_generator', '__return_empty_string' );
\ No newline at end of file