recaptcha - Switch to setting-admin@1

diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml
index ba2cc58ea36d4c35b274140b629cd16d7d468090..7d13c333f3d8ae92127a00f0ddf06c7743119692 100644 (file)
--- a/ext/recaptcha/info.xml
+++ b/ext/recaptcha/info.xml
@@ -26,7 +26,7 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <mixins>
-    <mixin>menu-xml@1.0.0</mixin>
+    <mixin>setting-admin@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
     <mixin>ang-php@1.0.0</mixin>
     <mixin>scan-classes@1.0.0</mixin>

diff --git a/ext/recaptcha/recaptcha.php b/ext/recaptcha/recaptcha.php
index e959cfb329c9323502ba1afd5a8801435c1537fe..49e8e1c7b5a877c88b22003f72a16dc1cf38c270 100644 (file)
--- a/ext/recaptcha/recaptcha.php
+++ b/ext/recaptcha/recaptcha.php
@@ -32,21 +32,6 @@ function recaptcha_civicrm_enable() {
   _recaptcha_civix_civicrm_enable();
 }
 
-/**
- * Implements hook_civicrm_navigationMenu().
- */
-function recaptcha_civicrm_navigationMenu(&$menu) {
-  _recaptcha_civix_insert_navigation_menu($menu, 'Administer/System Settings', [
-    'label' => E::ts('reCAPTCHA Settings'),
-    'name' => 'recaptcha_settings',
-    'url' => 'civicrm/admin/setting/recaptcha',
-    'permission' => 'administer CiviCRM',
-    'operator' => 'OR',
-    'separator' => 0,
-  ]);
-  _recaptcha_civix_navigationMenu($menu);
-}
-
 /**
  * Intercept form functions
  */

diff --git a/ext/recaptcha/xml/Menu/recaptcha.xml b/ext/recaptcha/xml/Menu/recaptcha.xml
deleted file mode 100644 (file)
index 558cefc..0000000
--- a/ext/recaptcha/xml/Menu/recaptcha.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<menu>
-  <item>
-    <path>civicrm/admin/setting/recaptcha</path>
-    <title>reCAPTCHA Settings</title>
-    <desc>Configure anti-abuse/bot-prevention service</desc>
-    <page_callback>CRM_Admin_Form_Generic</page_callback>
-    <access_arguments>administer CiviCRM</access_arguments>
-    <adminGroup>System Settings</adminGroup>
-  </item>
-</menu>