Changeset 6901

Timestamp:

02/26/2019 04:28:04 PM (5 years ago)

Author:

johnjamesjacoby

Message:

Upgrades: add empty() checks to untrusted variable values to avoid debug notices.

This change ensures that menu manipulations are not attempted via admin-area requests where they are not necessary (AJAX, shortinit, etc...) and fixes debug notices under those circumstances.

File:

• trunk/src/includes/admin/classes/class-bbp-admin.php (modified) (3 diffs)

trunk/src/includes/admin/classes/class-bbp-admin.php

@@ -400 +400 @@
         global $menu;
 
+        // Skip if no menu (AJAX, shortinit, etc...)
+        if ( empty( $menu ) ) {
+            return;
+        }
+
+        // Loop through menus, and maybe add the upgrade count
         foreach ( $menu as $menu_index => $menu_item ) {
             $found = array_search( 'tools.php', $menu_item, true );
@@ -417 +423 @@
     public function admin_menus() {
 
+        // Default hooks array
         $hooks = array();
 
@@ -423 +430 @@
 
         // Loop through tools and check
-        foreach ( $tools as $tool ) {
-
-            // Try to add the admin page
-            $page = add_management_page(
-                $tool['name'],
-                $tool['name'],
-                $tool['cap'],
-                $tool['page'],
-                $tool['func']
-            );
-
-            // Add page to hook if user can view it
-            if ( false !== $page ) {
-                $hooks[] = $page;
+        if ( ! empty( $tools ) ) {
+            foreach ( $tools as $tool ) {
+
+                // Try to add the admin page
+                $page = add_management_page(
+                    $tool['name'],
+                    $tool['name'],
+                    $tool['cap'],
+                    $tool['page'],
+                    $tool['func']
+                );
+
+                // Add page to hook if user can view it
+                if ( false !== $page ) {
+                    $hooks[] = $page;
+                }
             }
-        }
-
-        // Fudge the highlighted subnav item when on a bbPress admin page
-        foreach ( $hooks as $hook ) {
-            add_action( "admin_head-{$hook}", 'bbp_tools_modify_menu_highlight' );
+
+            // Fudge the highlighted subnav item when on a bbPress admin page
+            if ( ! empty( $hooks ) ) {
+                foreach ( $hooks as $hook ) {
+                    add_action( "admin_head-{$hook}", 'bbp_tools_modify_menu_highlight' );
+                }
+            }
         }