Changeset 6777 for trunk/src/includes/extend/buddypress/loader.php

Timestamp:

01/24/2018 01:01:49 AM (7 years ago)

Author:

johnjamesjacoby

Message:

General: user escaped GetText variant where no HTML is ever allowed in strings.

This change brings a few dozen strings up to par with the others, and ensures that strings are escaped on their way into the runtime environment.

File:

• trunk/src/includes/extend/buddypress/loader.php (modified) (15 diffs)

trunk/src/includes/extend/buddypress/loader.php

@@ -40 +40 @@
         parent::start(
             'forums',
-            __( 'Forums', 'bbpress' ),
+            esc_html__( 'Forums', 'bbpress' ),
             bbpress()->includes_dir . 'extend/buddypress/'
         );
@@ -105 +105 @@
             'root_slug'     => isset( $bp->pages->forums->slug ) ? $bp->pages->forums->slug : BP_FORUMS_SLUG,
             'has_directory' => false,
-            'search_string' => __( 'Search Forums...', 'bbpress' ),
+            'search_string' => esc_html__( 'Search Forums...', 'bbpress' ),
         );
 
@@ -175 +175 @@
         // Add 'Forums' to the main navigation
         $main_nav = array(
-            'name'                => __( 'Forums', 'bbpress' ),
+            'name'                => esc_html__( 'Forums', 'bbpress' ),
             'slug'                => $this->slug,
             'position'            => 80,
@@ -197 +197 @@
         // Topics started
         $sub_nav[] = array(
-            'name'            => __( 'Topics Started', 'bbpress' ),
+            'name'            => esc_html__( 'Topics Started', 'bbpress' ),
             'slug'            => bbp_get_topic_archive_slug(),
             'parent_url'      => $forums_link,
@@ -208 +208 @@
         // Replies to topics
         $sub_nav[] = array(
-            'name'            => __( 'Replies Created', 'bbpress' ),
+            'name'            => esc_html__( 'Replies Created', 'bbpress' ),
             'slug'            => bbp_get_reply_archive_slug(),
             'parent_url'      => $forums_link,
@@ -220 +220 @@
         if ( bbp_is_engagements_active() ) {
             $sub_nav[] = array(
-                'name'            => __( 'Engagements', 'bbpress' ),
+                'name'            => esc_html__( 'Engagements', 'bbpress' ),
                 'slug'            => bbp_get_user_engagements_slug(),
                 'parent_url'      => $forums_link,
@@ -233 +233 @@
         if ( bbp_is_favorites_active() ){
             $sub_nav[] = array(
-                'name'            => __( 'Favorites', 'bbpress' ),
+                'name'            => esc_html__( 'Favorites', 'bbpress' ),
                 'slug'            => bbp_get_user_favorites_slug(),
                 'parent_url'      => $forums_link,
@@ -246 +246 @@
         if ( bp_is_my_profile() && bbp_is_subscriptions_active() ) {
             $sub_nav[] = array(
-                'name'            => __( 'Subscriptions', 'bbpress' ),
+                'name'            => esc_html__( 'Subscriptions', 'bbpress' ),
                 'slug'            => bbp_get_user_subscriptions_slug(),
                 'parent_url'      => $forums_link,
@@ -297 +297 @@
                 'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
-                'title'  => __( 'Forums', 'bbpress' ),
+                'title'  => esc_html__( 'Forums', 'bbpress' ),
                 'href'   => $my_account_link
             );
@@ -305 +305 @@
                 'parent' => 'my-account-' . $this->id,
                 'id'     => 'my-account-' . $this->id . '-topics',
-                'title'  => __( 'Topics Started', 'bbpress' ),
+                'title'  => esc_html__( 'Topics Started', 'bbpress' ),
                 'href'   => $my_topics_link
             );
@@ -313 +313 @@
                 'parent' => 'my-account-' . $this->id,
                 'id'     => 'my-account-' . $this->id . '-replies',
-                'title'  => __( 'Replies Created', 'bbpress' ),
+                'title'  => esc_html__( 'Replies Created', 'bbpress' ),
                 'href'   => $my_replies_link
             );
@@ -322 +322 @@
                     'parent' => 'my-account-' . $this->id,
                     'id'     => 'my-account-' . $this->id . '-engagements',
-                    'title'  => __( 'Engagements', 'bbpress' ),
+                    'title'  => esc_html__( 'Engagements', 'bbpress' ),
                     'href'   => $my_engagements_link
                 );
@@ -332 +332 @@
                     'parent' => 'my-account-' . $this->id,
                     'id'     => 'my-account-' . $this->id . '-favorites',
-                    'title'  => __( 'Favorite Topics', 'bbpress' ),
+                    'title'  => esc_html__( 'Favorite Topics', 'bbpress' ),
                     'href'   => $my_favorites_link
                 );
@@ -342 +342 @@
                     'parent' => 'my-account-' . $this->id,
                     'id'     => 'my-account-' . $this->id . '-subscriptions',
-                    'title'  => __( 'Subscribed Topics', 'bbpress' ),
+                    'title'  => esc_html__( 'Subscribed Topics', 'bbpress' ),
                     'href'   => $my_subscriptions_link
                 );
@@ -362 +362 @@
         if ( bp_is_forums_component() ) {
             if ( bp_is_my_profile() ) {
-                $bp->bp_options_title = __( 'Forums', 'bbpress' );
+                $bp->bp_options_title = esc_html__( 'Forums', 'bbpress' );
             } elseif ( bp_is_user() ) {
                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(