Ticket #6929: 6929.patch

src/bp-core/admin/bp-core-admin-functions.php

@@ -828 +828 @@
                 return;
         }
 
+        $admin_page = 'tools.php';
+
+        if ( bp_is_network_activated() && ! bp_is_multiblog_mode() ) {
+                $admin_page = 'admin.php';
+        }
+
         bp_core_add_admin_notice(
                 sprintf(
                         __( 'Are your emails in the wrong language? Go to <a href="%s">BuddyPress Tools and run the "reinstall emails"</a> tool.', 'buddypress' ),
-                        bp_get_admin_url( 'tools.php?page=bp-tools' )
+                        esc_url( add_query_arg( 'page', 'bp-tools', bp_get_admin_url( $admin_page ) ) )
                 ),
                 'updated'
         );