Changeset 5069 for trunk/includes/topics/template.php

Timestamp:

08/14/2013 09:34:56 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Shift output escaping around in admin links to allow for filtering and passing additional HTML into them. Hat tip mourdak. Fixes #2090.

File:

• trunk/includes/topics/template.php (modified) (9 diffs)

trunk/includes/topics/template.php

@@ -2462 +2462 @@
             'link_after'   => '',
             'sep'          => ' | ',
-            'trash_text'   => __( 'Trash',   'bbpress' ),
-            'restore_text' => __( 'Restore', 'bbpress' ),
-            'delete_text'  => __( 'Delete',  'bbpress' )
+            'trash_text'   => esc_html__( 'Trash',   'bbpress' ),
+            'restore_text' => esc_html__( 'Restore', 'bbpress' ),
+            'delete_text'  => esc_html__( 'Delete',  'bbpress' )
         ), 'get_topic_trash_link' );
 
@@ -2475 +2475 @@
 
         if ( bbp_is_topic_trash( $topic->ID ) ) {
-            $actions['untrash'] = '<a title="' . esc_attr__( 'Restore this item from the Trash', 'bbpress' ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'bbp_toggle_topic_trash', 'sub_action' => 'untrash', 'topic_id' => $topic->ID ) ), 'untrash-' . $topic->post_type . '_' . $topic->ID ) ) . '">' . esc_html( $r['restore_text'] ) . '</a>';
+            $actions['untrash'] = '<a title="' . esc_attr__( 'Restore this item from the Trash', 'bbpress' ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'bbp_toggle_topic_trash', 'sub_action' => 'untrash', 'topic_id' => $topic->ID ) ), 'untrash-' . $topic->post_type . '_' . $topic->ID ) ) . '">' . $r['restore_text'] . '</a>';
         } elseif ( EMPTY_TRASH_DAYS ) {
-            $actions['trash']   = '<a title="' . esc_attr__( 'Move this item to the Trash', 'bbpress' ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'bbp_toggle_topic_trash', 'sub_action' => 'trash', 'topic_id' => $topic->ID ) ), 'trash-' . $topic->post_type . '_' . $topic->ID ) ) . '">' . esc_html( $r['trash_text'] ) . '</a>';
+            $actions['trash']   = '<a title="' . esc_attr__( 'Move this item to the Trash', 'bbpress' ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'bbp_toggle_topic_trash', 'sub_action' => 'trash', 'topic_id' => $topic->ID ) ), 'trash-' . $topic->post_type . '_' . $topic->ID ) ) . '">' . $r['trash_text'] . '</a>';
         }
 
         if ( bbp_is_topic_trash( $topic->ID ) || !EMPTY_TRASH_DAYS ) {
-            $actions['delete']  = '<a title="' . esc_attr__( 'Delete this item permanently', 'bbpress' ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'bbp_toggle_topic_trash', 'sub_action' => 'delete', 'topic_id' => $topic->ID ) ), 'delete-' . $topic->post_type . '_' . $topic->ID ) ) . '" onclick="return confirm(\'' . esc_js( __( 'Are you sure you want to delete that permanently?', 'bbpress' ) ) . '\' );">' . esc_html( $r['delete_text'] ) . '</a>';
+            $actions['delete']  = '<a title="' . esc_attr__( 'Delete this item permanently', 'bbpress' ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'bbp_toggle_topic_trash', 'sub_action' => 'delete', 'topic_id' => $topic->ID ) ), 'delete-' . $topic->post_type . '_' . $topic->ID ) ) . '" onclick="return confirm(\'' . esc_js( __( 'Are you sure you want to delete that permanently?', 'bbpress' ) ) . '\' );">' . $r['delete_text'] . '</a>';
         }
 
@@ -2592 +2592 @@
             'link_before'  => '',
             'link_after'   => '',
-            'stick_text'   => __( 'Stick',    'bbpress' ),
-            'unstick_text' => __( 'Unstick',  'bbpress' ),
-            'super_text'   => __( 'to front', 'bbpress' ),
+            'stick_text'   => esc_html__( 'Stick',      'bbpress' ),
+            'unstick_text' => esc_html__( 'Unstick',    'bbpress' ),
+            'super_text'   => esc_html__( '(to front)', 'bbpress' ),
         ), 'get_topic_stick_link' );
 
@@ -2607 +2607 @@
         $stick_uri = wp_nonce_url( $stick_uri, 'stick-topic_' . $topic->ID );
 
-        $stick_display = true === $is_sticky ? $r['unstick_text'] : $r['stick_text'];
+        $stick_display = ( true === $is_sticky ) ? $r['unstick_text'] : $r['stick_text'];
         $stick_display = '<a href="' . esc_url( $stick_uri ) . '">' . $stick_display . '</a>';
 
@@ -2614 +2614 @@
             $super_uri = wp_nonce_url( $super_uri, 'stick-topic_' . $topic->ID );
 
-            $super_display = ' (<a href="' . esc_url( $super_uri ) . '">' . $r['super_text'] . '</a>)';
+            $super_display = ' <a href="' . esc_url( $super_uri ) . '">' . $r['super_text'] . '</a>';
         } else {
             $super_display = '';
@@ -2663 +2663 @@
             'link_before'  => '',
             'link_after'   => '',
-            'merge_text'   => __( 'Merge', 'bbpress' ),
+            'merge_text'   => esc_html__( 'Merge', 'bbpress' ),
         ), 'get_topic_merge_link' );
 
@@ -2719 +2719 @@
             'link_after'   => '',
             'sep'          => ' | ',
-            'spam_text'    => __( 'Spam',   'bbpress' ),
-            'unspam_text'  => __( 'Unspam', 'bbpress' )
+            'spam_text'    => esc_html__( 'Spam',   'bbpress' ),
+            'unspam_text'  => esc_html__( 'Unspam', 'bbpress' )
         ), 'get_topic_spam_link' );
 
@@ -2768 +2768 @@
             'link_before'  => '',
             'link_after'   => '',
-            'reply_text'   => __( 'Reply', 'bbpress' ),
+            'reply_text'   => esc_html__( 'Reply', 'bbpress' ),
         ), 'get_topic_reply_link' );
 
@@ -2782 +2782 @@
         // Add $uri to the array, to be passed through the filter
         $r['uri'] = $uri;
-        $retval   = $r['link_before'] . '<a href="' . esc_url( $r['uri'] ) . '" class="bbp-topic-reply-link">' . esc_html( $r['reply_text'] ) . '</a>' . $r['link_after'];
+        $retval   = $r['link_before'] . '<a href="' . esc_url( $r['uri'] ) . '" class="bbp-topic-reply-link">' . $r['reply_text'] . '</a>' . $r['link_after'];
 
         return apply_filters( 'bbp_get_topic_reply_link', $retval, $r, $args );