Make WordPress Core

Ticket #40794: 40794.4.diff

File 40794.4.diff, 3.6 KB (added by jnylen0, 5 years ago)

Remove TODO comment - no longer necessary now that we are using a separate patch for trunk / 4.9.

  • src/wp-admin/about.php

    diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php
    index 47524fc..3b1655d 100644
    a b include( ABSPATH . 'wp-admin/admin-header.php' ); 
    4141                        <a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
    4242                        <a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
    4343                        <a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
     44                        <a href="freedoms.php?privacy" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
    4445                </h2>
    4546
    4647                <div class="feature-section one-col">
  • src/wp-admin/credits.php

    diff --git a/src/wp-admin/credits.php b/src/wp-admin/credits.php
    index 741fa08..8895dba 100644
    a b include( ABSPATH . 'wp-admin/admin-header.php' ); 
    2828        <a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
    2929        <a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
    3030        <a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
     31        <a href="freedoms.php?privacy" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
    3132</h2>
    3233
    3334<?php
  • src/wp-admin/freedoms.php

    diff --git a/src/wp-admin/freedoms.php b/src/wp-admin/freedoms.php
    index 963ba5c..ecfa3a5 100644
    a b $title = __( 'Freedoms' ); 
    1414list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
    1515
    1616include( ABSPATH . 'wp-admin/admin-header.php' );
     17
     18$nav_tab_class_freedoms = isset( $_GET['privacy'] ) ? 'nav-tab' : 'nav-tab nav-tab-active';
     19$nav_tab_class_privacy  = isset( $_GET['privacy'] ) ? 'nav-tab nav-tab-active' : 'nav-tab';
    1720?>
    1821<div class="wrap about-wrap">
    1922
    include( ABSPATH . 'wp-admin/admin-header.php' ); 
    2629<h2 class="nav-tab-wrapper wp-clearfix">
    2730        <a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
    2831        <a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
    29         <a href="freedoms.php" class="nav-tab nav-tab-active"><?php _e( 'Freedoms' ); ?></a>
     32        <a href="freedoms.php" class="<?php echo $nav_tab_class_freedoms; ?>"><?php _e( 'Freedoms' ); ?></a>
     33        <a href="freedoms.php?privacy" class="<?php echo $nav_tab_class_privacy; ?>"><?php _e( 'Privacy' ); ?></a>
    3034</h2>
    3135
     36<?php if ( isset( $_GET['privacy'] ) ): ?>
     37
     38<p class="about-description"><?php _e( 'Your WordPress site may send anonymous data including, but not limited to, the list of installed plugins and themes to WordPress.org when requesting updates.' ); ?></p>
     39
     40<p><?php _e( 'This data helps WordPress to protect your site by finding and automatically installing new updates. None of the information shared with the update server contains personally identifiable information.' ); ?></p>
     41
     42<p><?php printf( __( 'We take privacy seriously. Learn more at <a href="%s">wordpress.org/privacy</a>.' ), __( 'https://wordpress.org/about/privacy/' ) ); ?></p>
     43
     44<?php else: ?>
     45
    3246<p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>
    3347
    3448<ol start="0">
    printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% 
    4963
    5064<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
    5165
    52 </div>
     66<?php endif; ?>
     67
     68</div><!-- .about-wrap -->
    5369<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>