← Back to branch summary

~ubuntu-branches/debian/sid/wordpress/sid

« back to all changes in this revision

Viewing changes to wp-admin/includes/class-wp-comments-list-table.php

  • Committer: Package Import Robot
  • Author(s): Raphaël Hertzog
  • Date: 2013-09-04 23:18:58 UTC
  • mfrom: (1.2.28)
  • Revision ID: package-import@ubuntu.com-20130904231858-nljmn1buzswh63jk
Tags: 3.6+dfsg-1
* New upstream release.
* Improve wp-settings to verify that $_SERVER['HTTP_X_FORWARDED_PROTO']
  exists before accessing it (avoids a PHP notice).
  Thanks to Paul Dreik <slask@pauldreik.se> for the report and the patch.
* Document in README.Debian the need to login to /wp-admin/ to complete
  an upgrade.
* Drop useless debian/README.source
* Drop 008CVE2008-2392.patch since upstream now disables unfiltered
  uploads by default. See http://core.trac.wordpress.org/ticket/10692
* Drop 009CVE2008-6767.patch since the backto parameter is validated
  against a whitelist, and externally triggered upgrades are not a
  security problem as long as they work.
* Update debian/missing-sources with latest versions.
* Update upstream l10n.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/class-wp-comments-list-table.php
170
170
                        /*
171
171
                        // I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
172
172
                        if ( !empty( $_REQUEST['s'] ) )
173
 
                                $link = add_query_arg( 's', esc_attr( stripslashes( $_REQUEST['s'] ) ), $link );
 
173
                                $link = add_query_arg( 's', esc_attr( wp_unslash( $_REQUEST['s'] ) ), $link );
174
174
                        */
175
175
                        $status_links[$status] = "<a href='$link'$class>" . sprintf(
176
176
                                translate_nooped_plural( $label, $num_comments->$status ),
315
315
                $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
316
316
 
317
317
                echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
318
 
                echo $this->single_row_columns( $comment );
 
318
                $this->single_row_columns( $comment );
319
319
                echo "</tr>\n";
320
320
        }
321
321
 
336
336
                $comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
337
337
                $the_comment_status = wp_get_comment_status( $comment->comment_ID );
338
338
 
339
 
                $ptime = date( 'G', strtotime( $comment->comment_date ) );
340
 
                if ( ( abs( time() - $ptime ) ) < DAY_IN_SECONDS )
341
 
                        $ptime = sprintf( __( '%s ago' ), human_time_diff( $ptime ) );
342
 
                else
343
 
                        $ptime = mysql2date( __( 'Y/m/d \a\t g:i A' ), $comment->comment_date );
344
 
 
345
339
                if ( $user_can ) {
346
340
                        $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
347
341
                        $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
360
354
                echo '<div class="submitted-on">';
361
355
                /* translators: 2: comment date, 3: comment time */
362
356
                printf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
363
 
                        /* translators: comment date format. See http://php.net/date */ get_comment_date( __( 'Y/m/d' ) ),
364
 
                        /* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
 
357
                        /* translators: comment date format. See http://php.net/date */
 
358
                        get_comment_date( __( 'Y/m/d' ) ),
 
359
                        get_comment_date( get_option( 'time_format' ) )
 
360
                );
365
361
 
366
362
                if ( $comment->comment_parent ) {
367
363
                        $parent = get_comment( $comment->comment_parent );
456
452
                        $author_url = '';
457
453
                $author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
458
454
                if ( strlen( $author_url_display ) > 50 )
459
 
                        $author_url_display = substr( $author_url_display, 0, 49 ) . '...';
 
455
                        $author_url_display = substr( $author_url_display, 0, 49 ) . '&hellip;';
460
456
 
461
457
                echo "<strong>"; comment_author(); echo '</strong><br />';
462
458
                if ( !empty( $author_url ) )