Make WordPress Core

Ticket #32277: 32277.diff

File 32277.diff, 5.3 KB (added by Shelob9, 9 years ago)

use get_permalink() for post link

  • wp-admin/about.php

     
    3737                <?php _e( 'Credits' ); ?>
    3838        </a><a href="freedoms.php" class="nav-tab">
    3939                <?php _e( 'Freedoms' ); ?>
     40        </a><a href="contribute.php" class="nav-tab">
     41                <?php _e( 'Contribute' ); ?>
    4042        </a>
    4143</h2>
    4244
     45<<<<<<< .mine
     46<div class="changelog headline-feature">
     47        <h2><?php _e( 'Introducing Twenty&nbsp;Fifteen' ); ?></h2>
     48        <div class="featured-image">
     49                <img src="//s.w.org/images/core/4.1/theme.png?0" />
     50        </div>
     51=======
    4352<div class="headline-feature feature-video">
    4453        <embed type="application/x-shockwave-flash" src="https://v0.wordpress.com/player.swf?v=1.04" width="1000" height="560" wmode="direct" seamlesstabbing="true" allowfullscreen="true" allowscriptaccess="always" overstretch="true" flashvars="guid=e9kH4FzP&amp;isDynamicSeeking=true"></embed>
    4554</div>
     55>>>>>>> .r32419
    4656
     57<<<<<<< .mine
     58        <div class="feature-section">
     59                <div class="col">
     60                        <h3><?php _e( 'Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.' ); ?></h3>
     61                        <p><?php printf( __( 'Twenty Fifteen has flawless language support, with help from <a href="%s">Google&#8217;s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?></p>
     62                        <p><?php _e( 'The straightforward typography is readable on any screen size.' ); ?></p>
     63                         <p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p>
     64                </div>
     65                <div class="col">
     66                        <img class="" src="//s.w.org/images/core/4.1/mobile.png?0" />
     67                </div>
     68=======
    4769<hr />
    4870
    4971<div class="feature-section two-col">
     
    5577                <p class="pressthis-bookmarklet-demo">
    5678                        <a class="pressthis-bookmarklet" onclick="return false;" href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>"><span><?php _e( 'Press This' ); ?></span></a>
    5779                </p>
     80>>>>>>> .r32419
    5881        </div>
    5982
    6083        <div class="col">
     
    6285        </div>
    6386</div>
    6487
     88<<<<<<< .mine
     89<hr />
     90
     91<div class="changelog headline-feature dfw">
     92        <h2><?php _e( 'Distraction-free writing' ); ?></h2>
     93        <div class="feature-section">
     94                <div class="dfw-container">
     95                        <img src="//s.w.org/images/core/4.1/focus.png?0" class="base-image" />
     96                        <img src="//s.w.org/images/core/4.1/focus1.png?0" class="overlay-image fade-in" />
     97                        <img src="//s.w.org/images/core/4.1/focus2.png?0" class="overlay-image fade-in" />
     98                        <img src="//s.w.org/images/core/4.1/focus3.png?0" class="overlay-image from-left" />
     99                </div>
     100                <h3><em><?php _e( 'Just write.' ); ?></em></h3>
     101                <p><?php _e( 'Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>distraction-free writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p>
     102=======
    65103<div class="feature-section two-col">
    66104        <div class="col">
    67105                <img src="//s.w.org/images/core/4.2/unicode.png" />
     
    73111                        /* translators: 1: heart emoji, 2: frog face emoji, 3, monkey emoji, 4: pizza emoji, 5: Emoji Codex link */
    74112                        printf( __( 'Don&#8217;t use any of those characters? You can still have fun &mdash; emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other <a href="%5$s">emoji</a>.' ), '&#x1F499', '&#x1F438', '&#x1F412', '&#x1F355', __( 'https://codex.wordpress.org/Emoji' ) );
    75113                ?></p>
     114>>>>>>> .r32419
    76115        </div>
    77116</div>
    78117
  • wp-admin/credits.php

     
    9393                <?php _e( 'Credits' ); ?>
    9494        </a><a href="freedoms.php" class="nav-tab">
    9595                <?php _e( 'Freedoms' ); ?>
     96        </a><a href="contribute.php" class="nav-tab">
     97                <?php _e( 'Contribute' ); ?>
    9698        </a>
    9799</h2>
    98100
  • wp-admin/freedoms.php

     
    3030                <?php _e( 'Credits' ); ?>
    3131        </a><a href="freedoms.php" class="nav-tab nav-tab-active">
    3232                <?php _e( 'Freedoms' ); ?>
     33        </a><a href="contribute.php" class="nav-tab">
     34                <?php _e( 'Contribute' ); ?>
    3335        </a>
    3436</h2>
    3537
  • wp-includes/comment-template.php

     
    14231423                );
    14241424
    14251425                $link = sprintf( "<a class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
    1426                         esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $args['respond_id'],
     1426                        esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
    14271427                        $onclick,
    14281428                        esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
    14291429                        $args['reply_text']
  • wp-includes/user.php

     
    8585                        $user = new WP_Error('', '');
    8686                }
    8787
     88                status_header( 403 );
    8889                return $user;
    8990        }
    9091