diff --git a/composer.json b/composer.json index 9e65a97fccef32fd29b8891e666d569ea07adcae..56e5e9a6d03038f59bd520fcf556af074f23dd71 100644 --- a/composer.json +++ b/composer.json @@ -97,7 +97,6 @@ "wpackagist-plugin/two-factor": "0.8.2", "wpackagist-plugin/video-sidebar-widgets": "6.1", "wpackagist-plugin/wordpress-importer": "0.8.1", - "wpackagist-plugin/wp2pgpmail": "1.28", "wpackagist-plugin/katex": "2.2.3", "noblogs/eu-compliance": "0.1.0", "noblogs/nospam": "0.2.4", diff --git a/composer.lock b/composer.lock index 3c6157c3bd9dd5fc300196f2e8b7a2e9c15074a8..c43c74a57a3758175a07b800c8b8d80b5b504ec3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d8d7d067b25ccd240e732fd836c271b7", + "content-hash": "28ed176c8a099cd80ec1fb25fffea76c", "packages": [ { "name": "bjornjohansen/wplang", @@ -1436,24 +1436,6 @@ "type": "wordpress-plugin", "homepage": "https://wordpress.org/plugins/wp-syntax/" }, - { - "name": "wpackagist-plugin/wp2pgpmail", - "version": "1.28", - "source": { - "type": "svn", - "url": "https://plugins.svn.wordpress.org/wp2pgpmail/", - "reference": "trunk" - }, - "dist": { - "type": "zip", - "url": "https://downloads.wordpress.org/plugin/wp2pgpmail.zip?timestamp=1684491231" - }, - "require": { - "composer/installers": "^1.0 || ^2.0" - }, - "type": "wordpress-plugin", - "homepage": "https://wordpress.org/plugins/wp2pgpmail/" - }, { "name": "wpackagist-plugin/wpuntexturize", "version": "2.2.1", diff --git a/composer.patches.json b/composer.patches.json index f554e2aec0344cd27b812396825a21281d8bceb0..dbd362a760d4d57d79c16266626e39f9b58e6750 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -25,9 +25,6 @@ "wpackagist-plugin/simply-exclude": { "Small workaround to fix simplyexclude plugin broken with wordpress 4": "patches/plugins/0117-simplyexclude.patch" }, - "wpackagist-plugin/wp2pgpmail": { - "Fix path of openpgp.worker.min.js": "patches/plugins/wp2pgpmail-openpgpjs-path.patch" - }, "wpackagist-theme/azul": { "Teme footer": "patches/themes/0056-Patch-theme-azul.patch" }, diff --git a/patches/plugins/wp2pgpmail-openpgpjs-path.patch b/patches/plugins/wp2pgpmail-openpgpjs-path.patch deleted file mode 100644 index 8fa0eff3c0d2fa448059e853a61110bcfb346ea0..0000000000000000000000000000000000000000 --- a/patches/plugins/wp2pgpmail-openpgpjs-path.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- app/wp-content/plugins/wp2pgpmail/classes/formulaire.inc.php.orig 2022-05-02 16:38:29.083188269 +0100 -+++ app/wp-content/plugins/wp2pgpmail/classes/formulaire.inc.php 2022-05-02 16:43:51.223915579 +0100 -@@ -10,7 +10,7 @@ - $wp2pgpmail_pgpkey = get_option('wp2pgpmail_pgpkey'); - $wp2pgpmail_captcha_field = get_option('wp2pgpmail_captcha_field'); - $wp2pgpmail_collect_ip = get_option('wp2pgpmail_collect_ip'); -- $wp2pgpmail_worker_path = plugin_dir_url( 'wp2pgpmail' ) . 'js/openpgp.worker.min.js'; -+ $wp2pgpmail_worker_path = plugin_dir_url( __DIR__ ) . 'js/openpgp.worker.min.js'; - - $mail_champ_nom = __('Name','wp2pgpmail'); - $mail_champ_email = __('E-mail Address','wp2pgpmail'); -@@ -190,4 +190,4 @@ - EOF; - return $this->Output; - } --} -\ No newline at end of file -+}