From 5a2244845f0dac9ea61aaa94d796781a557a0aaf Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 4 Aug 2021 17:27:28 -0700
Subject: [PATCH] dev/core#2728 - ReCAPTCHA - Consistently present link to
 settings

See also: https://lab.civicrm.org/dev/core/-/issues/2728

Before
------

"ReCAPTCHA Settings" appears in "Customize Data and Screens" in the nav-menu, and it is missing in the `civicrm/admin` dashboard.

After
-----

"ReCAPTCHA Settings" appears "System Settings" for both the nav-menu and the `civicrm/admin` dashboard.
---
 ext/recaptcha/recaptcha.php          | 2 +-
 ext/recaptcha/xml/Menu/recaptcha.xml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/recaptcha/recaptcha.php b/ext/recaptcha/recaptcha.php
index 4cf2ea5523..9cad89a71c 100644
--- a/ext/recaptcha/recaptcha.php
+++ b/ext/recaptcha/recaptcha.php
@@ -127,7 +127,7 @@ function recaptcha_civicrm_entityTypes(&$entityTypes) {
  * Implements hook_civicrm_navigationMenu().
  */
 function recaptcha_civicrm_navigationMenu(&$menu) {
-  _recaptcha_civix_insert_navigation_menu($menu, 'Administer/Customize Data and Screens', [
+  _recaptcha_civix_insert_navigation_menu($menu, 'Administer/System Settings', [
     'label' => E::ts('reCAPTCHA Settings'),
     'name' => 'recaptcha_settings',
     'url' => 'civicrm/admin/setting/recaptcha',
diff --git a/ext/recaptcha/xml/Menu/recaptcha.xml b/ext/recaptcha/xml/Menu/recaptcha.xml
index 46472f77a8..558cefcf2c 100644
--- a/ext/recaptcha/xml/Menu/recaptcha.xml
+++ b/ext/recaptcha/xml/Menu/recaptcha.xml
@@ -3,7 +3,9 @@
   <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>
-- 
2.25.1