Changeset 5688 for trunk/src/templates/default/bbpress-functions.php

Timestamp:

04/19/2015 04:27:37 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Templates: Escape all gettext output in default template parts. See #1999.

File:

• trunk/src/templates/default/bbpress-functions.php (modified) (15 diffs)

trunk/src/templates/default/bbpress-functions.php

@@ -49 +49 @@
         parent::__construct( bbp_parse_args( $properties, array(
             'id'      => 'default',
-            'name'    => __( 'bbPress Default', 'bbpress' ),
+            'name'    => 'bbPress Default',
             'version' => bbp_get_version(),
             'dir'     => trailingslashit( bbpress()->themes_dir . 'default' ),
@@ -241 +241 @@
             wp_localize_script( 'bbpress-forum', 'bbpForumJS', array(
                 'bbp_ajaxurl'        => bbp_get_ajax_url(),
-                'generic_ajax_error' => __( 'Something went wrong. Refresh your browser and try again.', 'bbpress' ),
+                'generic_ajax_error' => esc_html__( 'Something went wrong. Refresh your browser and try again.', 'bbpress' ),
                 'is_user_logged_in'  => is_user_logged_in(),
                 'subs_nonce'         => wp_create_nonce( 'toggle-subscription_' . get_the_ID() )
@@ -250 +250 @@
             wp_localize_script( 'bbpress-topic', 'bbpTopicJS', array(
                 'bbp_ajaxurl'        => bbp_get_ajax_url(),
-                'generic_ajax_error' => __( 'Something went wrong. Refresh your browser and try again.', 'bbpress' ),
+                'generic_ajax_error' => esc_html__( 'Something went wrong. Refresh your browser and try again.', 'bbpress' ),
                 'is_user_logged_in'  => is_user_logged_in(),
                 'fav_nonce'          => wp_create_nonce( 'toggle-favorite_' .     get_the_ID() ),
@@ -278 +278 @@
         // Bail if subscriptions are not active
         if ( ! bbp_is_subscriptions_active() ) {
-            bbp_ajax_response( false, __( 'Subscriptions are no longer active.', 'bbpress' ), 300 );
+            bbp_ajax_response( false, esc_html__( 'Subscriptions are no longer active.', 'bbpress' ), 300 );
         }
 
         // Bail if user is not logged in
         if ( ! is_user_logged_in() ) {
-            bbp_ajax_response( false, __( 'Please login to subscribe to this forum.', 'bbpress' ), 301 );
+            bbp_ajax_response( false, esc_html__( 'Please login to subscribe to this forum.', 'bbpress' ), 301 );
         }
 
@@ -292 +292 @@
         // Bail if user cannot add favorites for this user
         if ( ! current_user_can( 'edit_user', $user_id ) ) {
-            bbp_ajax_response( false, __( 'You do not have permission to do this.', 'bbpress' ), 302 );
+            bbp_ajax_response( false, esc_html__( 'You do not have permission to do this.', 'bbpress' ), 302 );
         }
 
@@ -300 +300 @@
         // Bail if forum cannot be found
         if ( empty( $forum ) ) {
-            bbp_ajax_response( false, __( 'The forum could not be found.', 'bbpress' ), 303 );
+            bbp_ajax_response( false, esc_html__( 'The forum could not be found.', 'bbpress' ), 303 );
         }
 
         // Bail if user did not take this action
         if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'toggle-subscription_' . $forum->ID ) ) {
-            bbp_ajax_response( false, __( 'Are you sure you meant to do that?', 'bbpress' ), 304 );
+            bbp_ajax_response( false, esc_html__( 'Are you sure you meant to do that?', 'bbpress' ), 304 );
         }
 
@@ -313 +313 @@
         // Bail if action failed
         if ( empty( $status ) ) {
-            bbp_ajax_response( false, __( 'The request was unsuccessful. Please try again.', 'bbpress' ), 305 );
+            bbp_ajax_response( false, esc_html__( 'The request was unsuccessful. Please try again.', 'bbpress' ), 305 );
         }
 
@@ -346 +346 @@
         // Bail if favorites are not active
         if ( ! bbp_is_favorites_active() ) {
-            bbp_ajax_response( false, __( 'Favorites are no longer active.', 'bbpress' ), 300 );
+            bbp_ajax_response( false, esc_html__( 'Favorites are no longer active.', 'bbpress' ), 300 );
         }
 
         // Bail if user is not logged in
         if ( ! is_user_logged_in() ) {
-            bbp_ajax_response( false, __( 'Please login to make this topic a favorite.', 'bbpress' ), 301 );
+            bbp_ajax_response( false, esc_html__( 'Please login to make this topic a favorite.', 'bbpress' ), 301 );
         }
 
@@ -360 +360 @@
         // Bail if user cannot add favorites for this user
         if ( ! current_user_can( 'edit_user', $user_id ) ) {
-            bbp_ajax_response( false, __( 'You do not have permission to do this.', 'bbpress' ), 302 );
+            bbp_ajax_response( false, esc_html__( 'You do not have permission to do this.', 'bbpress' ), 302 );
         }
 
@@ -368 +368 @@
         // Bail if topic cannot be found
         if ( empty( $topic ) ) {
-            bbp_ajax_response( false, __( 'The topic could not be found.', 'bbpress' ), 303 );
+            bbp_ajax_response( false, esc_html__( 'The topic could not be found.', 'bbpress' ), 303 );
         }
 
         // Bail if user did not take this action
         if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'toggle-favorite_' . $topic->ID ) ) {
-            bbp_ajax_response( false, __( 'Are you sure you meant to do that?', 'bbpress' ), 304 );
+            bbp_ajax_response( false, esc_html__( 'Are you sure you meant to do that?', 'bbpress' ), 304 );
         }
 
@@ -381 +381 @@
         // Bail if action failed
         if ( empty( $status ) ) {
-            bbp_ajax_response( false, __( 'The request was unsuccessful. Please try again.', 'bbpress' ), 305 );
+            bbp_ajax_response( false, esc_html__( 'The request was unsuccessful. Please try again.', 'bbpress' ), 305 );
         }
 
@@ -414 +414 @@
         // Bail if subscriptions are not active
         if ( ! bbp_is_subscriptions_active() ) {
-            bbp_ajax_response( false, __( 'Subscriptions are no longer active.', 'bbpress' ), 300 );
+            bbp_ajax_response( false, esc_html__( 'Subscriptions are no longer active.', 'bbpress' ), 300 );
         }
 
         // Bail if user is not logged in
         if ( ! is_user_logged_in() ) {
-            bbp_ajax_response( false, __( 'Please login to subscribe to this topic.', 'bbpress' ), 301 );
+            bbp_ajax_response( false, esc_html__( 'Please login to subscribe to this topic.', 'bbpress' ), 301 );
         }
 
@@ -428 +428 @@
         // Bail if user cannot add favorites for this user
         if ( ! current_user_can( 'edit_user', $user_id ) ) {
-            bbp_ajax_response( false, __( 'You do not have permission to do this.', 'bbpress' ), 302 );
+            bbp_ajax_response( false, esc_html__( 'You do not have permission to do this.', 'bbpress' ), 302 );
         }
 
@@ -436 +436 @@
         // Bail if topic cannot be found
         if ( empty( $topic ) ) {
-            bbp_ajax_response( false, __( 'The topic could not be found.', 'bbpress' ), 303 );
+            bbp_ajax_response( false, esc_html__( 'The topic could not be found.', 'bbpress' ), 303 );
         }
 
         // Bail if user did not take this action
         if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'toggle-subscription_' . $topic->ID ) ) {
-            bbp_ajax_response( false, __( 'Are you sure you meant to do that?', 'bbpress' ), 304 );
+            bbp_ajax_response( false, esc_html__( 'Are you sure you meant to do that?', 'bbpress' ), 304 );
         }
 
@@ -449 +449 @@
         // Bail if action failed
         if ( empty( $status ) ) {
-            bbp_ajax_response( false, __( 'The request was unsuccessful. Please try again.', 'bbpress' ), 305 );
+            bbp_ajax_response( false, esc_html__( 'The request was unsuccessful. Please try again.', 'bbpress' ), 305 );
         }