Changeset 59674

Timestamp:

01/21/2025 09:24:59 PM (2 months ago)

Author:

westonruter

Message:

Menus: Improve performance by calling get_privacy_policy_url() once per Walker_Nav_Menu instance rather than for every nav menu item.

The start_el() method in Walker_Nav_Menu was calling get_privacy_policy_url() for every menu item when building menus. This resulted in redundant queries, particularly for menus with many items. This obtains the get_privacy_policy_url() value in the constructor for reuse in the start_el() method to improve performance.

Redundant code to construct the privacy policy page is also refactored into the set_up() method during tests.

Props arzola, swissspidy, westonruter, mukesh27.
Fixes #62818.

Location:

trunk

Files:

• src/wp-includes/class-walker-nav-menu.php (modified) (2 diffs)
• tests/phpunit/tests/menu/walker-nav-menu.php (modified) (6 diffs)

trunk/src/wp-includes/class-walker-nav-menu.php

@@ -41 +41 @@
 
     /**
+     * The URL to the privacy policy page.
+     *
+     * @since 6.8.0
+     * @var string
+     */
+    private $privacy_policy_url;
+
+    /**
+     * Constructor.
+     *
+     * @since 6.8.0
+     */
+    public function __construct() {
+        $this->privacy_policy_url = get_privacy_policy_url();
+    }
+
+    /**
      * Starts the list before the elements are added.
      *
@@ -237 +254 @@
 
         if ( ! empty( $menu_item->url ) ) {
-            if ( get_privacy_policy_url() === $menu_item->url ) {
+            if ( $this->privacy_policy_url === $menu_item->url ) {
                 $atts['rel'] = empty( $atts['rel'] ) ? 'privacy-policy' : $atts['rel'] . ' privacy-policy';
             }

trunk/tests/phpunit/tests/menu/walker-nav-menu.php

@@ -19 +19 @@
 
     /**
+     * The ID of the privacy policy page.
+     *
+     * @var int
+     */
+    private $privacy_policy_id;
+
+    /**
      * Setup.
      */
@@ -28 +35 @@
         /** Walker_Nav_Menu class */
         require_once ABSPATH . 'wp-includes/class-walker-nav-menu.php';
+
+        $post_id = self::factory()->post->create(
+            array(
+                'post_type'   => 'page',
+                'post_title'  => 'Test Privacy Policy',
+                'post_status' => 'publish',
+            )
+        );
+
+        // Set the privacy policy page.
+        update_option( 'wp_page_for_privacy_policy', $post_id );
+        $this->privacy_policy_id = (int) get_option( 'wp_page_for_privacy_policy' );
+
         $this->walker = new Walker_Nav_Menu();
 
@@ -40 +60 @@
 
         $_wp_nav_menu_max_depth = $this->orig_wp_nav_menu_max_depth;
+        delete_option( 'wp_page_for_privacy_policy' );
         parent::tear_down();
     }
@@ -137 +158 @@
      */
     public function test_walker_nav_menu_start_el_should_add_rel_privacy_policy_to_privacy_policy_url( $expected, $xfn = '', $target = '' ) {
-        $post_id = self::factory()->post->create(
-            array(
-                'post_type'   => 'page',
-                'post_title'  => 'Test Privacy Policy',
-                'post_status' => 'publish',
-            )
-        );
-
-        // Set the privacy policy page.
-        update_option( 'wp_page_for_privacy_policy', $post_id );
-        $privacy_policy_id = (int) get_option( 'wp_page_for_privacy_policy' );
 
         $output = '';
 
         $item = array(
-            'ID'        => $privacy_policy_id,
-            'object_id' => $privacy_policy_id,
+            'ID'        => $this->privacy_policy_id,
+            'object_id' => $this->privacy_policy_id,
             'title'     => 'Privacy Policy',
             'target'    => $target,
@@ -252 +262 @@
      */
     public function test_walker_nav_menu_start_el_should_not_add_rel_privacy_policy_when_no_url_is_passed() {
-        $post_id = self::factory()->post->create(
-            array(
-                'post_type'   => 'page',
-                'post_title'  => 'Test Privacy Policy',
-                'post_status' => 'publish',
-            )
-        );
-
-        // Set the privacy policy page.
-        update_option( 'wp_page_for_privacy_policy', $post_id );
-        $privacy_policy_id = (int) get_option( 'wp_page_for_privacy_policy' );
 
         $output = '';
 
         $item = array(
-            'ID'        => $privacy_policy_id,
-            'object_id' => $privacy_policy_id,
+            'ID'        => $this->privacy_policy_id,
+            'object_id' => $this->privacy_policy_id,
             'title'     => 'Privacy Policy',
             'target'    => '',
@@ -297 +296 @@
      */
     public function test_walker_nav_menu_start_el_should_add_rel_privacy_policy_when_id_does_not_match_but_url_does() {
-        $post_id = self::factory()->post->create(
-            array(
-                'post_type'   => 'page',
-                'post_title'  => 'Test Privacy Policy',
-                'post_status' => 'publish',
-            )
-        );
-
-        // Set the privacy policy page.
-        update_option( 'wp_page_for_privacy_policy', $post_id );
-        $privacy_policy_id = (int) get_option( 'wp_page_for_privacy_policy' );
 
         $output = '';
 
         // Ensure the ID does not match the privacy policy.
-        $not_privacy_policy_id = $privacy_policy_id - 1;
+        $not_privacy_policy_id = $this->privacy_policy_id - 1;
 
         $item = array(