Changeset 43507 for branches/4.9

Timestamp:

07/18/2018 11:51:06 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Use the actual Privacy Policy page title in get_the_privacy_policy_link().

Props desrosj, birgire, ianbelanger, Ov3rfly.
Merges [43506] to the 4.9 branch.
Fixes #44192.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/link-template.php (modified) (1 diff)
• tests/phpunit/tests/link/getThePrivacyPolicyLink.php (modified) (3 diffs)

branches/4.9/src/wp-includes/link-template.php

@@ -4159 +4159 @@
     $link               = '';
     $privacy_policy_url = get_privacy_policy_url();
-
-    if ( $privacy_policy_url ) {
+    $policy_page_id     = (int) get_option( 'wp_page_for_privacy_policy' );
+    $page_title         = ( $policy_page_id ) ? get_the_title( $policy_page_id ) : '';
+
+    if ( $privacy_policy_url && $page_title ) {
         $link = sprintf(
             '<a class="privacy-policy-link" href="%s">%s</a>',
             esc_url( $privacy_policy_url ),
-            __( 'Privacy Policy' )
+            esc_html( $page_title )
         );
     }

branches/4.9/tests/phpunit/tests/link/getThePrivacyPolicyLink.php

@@ -72 +72 @@
     /**
      * The function should return a valid link if a privacy policy page has been
-     * created and set as the `wp_page_for_privacy_policy`.
+     * created and set as the `wp_page_for_privacy_policy`. The post title should
+     * be used as the link text.
      */
     public function test_get_the_privacy_policy_link_should_return_valid_link_when_privacy_page_set() {
@@ -81 +82 @@
         $this->assertStringStartsWith( '<a', $actual_link );
         $this->assertContains( self::$privacy_policy_url, $actual_link );
-        $this->assertStringEndsWith( '</a>', $actual_link );
+        $this->assertStringEndsWith( '>' . WP_TESTS_DOMAIN . ' Privacy Policy</a>', $actual_link );
     }
 
@@ -106 +107 @@
 
         $this->assertSame( '', $actual_link );
+    }
+
+    /**
+     * The function should return an empty string when there is an empty page title
+     * for the privacy policy.
+     *
+     * @ticket 44192
+     */
+    public function test_function_should_return_empty_string_when_privacy_page_title_empty() {
+        $nameless_page_id = $this->factory->post->create(
+            array(
+                'post_type'  => 'page',
+                'post_title' => '',
+            )
+        );
+
+        update_option( 'wp_page_for_privacy_policy', $nameless_page_id );
+
+        $this->assertSame( '', get_the_privacy_policy_link( self::$before, self::$after ) );
     }