Changeset 9467

Timestamp:

02/10/2015 12:12:52 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace all references to bp_get_root_domain() . '/' . bp_get_members_root_slug() with bp_get_members_directory_permalink(), ensuring all usages and filters are applied uniformly. See #4954.

Location:

trunk/src

Files:

• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/deprecated/2.1.php (modified) (1 diff)
• bp-forums/bp-forums-filters.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (1 diff)
• bp-members/bp-members-screens.php (modified) (2 diffs)
• bp-members/bp-members-widgets.php (modified) (1 diff)

trunk/src/bp-core/bp-core-catchuri.php

@@ -649 +649 @@
         // the members directory to avoid redirect loops
         } elseif ( bp_is_register_page() && 'register' == $front_page_component && is_user_logged_in() ) {
-            $bp->canonical_stack['canonical_url'] = apply_filters( 'bp_loggedin_register_page_redirect_to', trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) );
+            $bp->canonical_stack['canonical_url'] = apply_filters( 'bp_loggedin_register_page_redirect_to', bp_get_members_directory_permalink() );
         }
     }

trunk/src/bp-core/deprecated/2.1.php

@@ -340 +340 @@
         <a href="#"><?php _e( 'Visit', 'buddypress' ) ?></a>
         <ul class="random-list">
-            <li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) . '?random-member' ?>" rel="nofollow"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
+            <li><a href="<?php bp_members_directory_permalink(); ?>?random-member" rel="nofollow"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
 
             <?php if ( bp_is_active( 'groups' ) ) : ?>

trunk/src/bp-forums/bp-forums-filters.php

@@ -168 +168 @@
  * Prevents embedded anchor tags.
  *
- * @global object $bp Global BuddyPress settings object.
- *
  * @param string $content Edited post content.
  * @return string $content Sanitized post content.
  */
 function bp_forums_strip_mentions_on_post_edit( $content ) {
-    global $bp;
-
-    $content = htmlspecialchars_decode( $content );
-
-    $pattern = "|<a href=&#039;" . bp_get_root_domain() . "/" . bp_get_members_root_slug() . "/[A-Za-z0-9-_\.]+/&#039; rel=&#039;nofollow&#039;>(@[A-Za-z0-9-_\.@]+)</a>|";
-
-    $content = preg_replace( $pattern, "$1", $content );
+    $content   = htmlspecialchars_decode( $content );
+    $directory = bp_get_members_directory_permalink();
+    $pattern   = "|<a href=&#039;{$directory}[A-Za-z0-9-_\.]+/&#039; rel=&#039;nofollow&#039;>(@[A-Za-z0-9-_\.@]+)</a>|";
+    $content   = preg_replace( $pattern, "$1", $content );
 
     return $content;
 }
 add_filter( 'bp_get_the_topic_post_edit_text', 'bp_forums_strip_mentions_on_post_edit' );
-add_filter( 'bp_get_the_topic_text', 'bp_forums_strip_mentions_on_post_edit' );
+add_filter( 'bp_get_the_topic_text',           'bp_forums_strip_mentions_on_post_edit' );
 
 /** "Replied to" SQL filters *************************************************/

trunk/src/bp-forums/bp-forums-template.php

@@ -1043 +1043 @@
         global $forum_template;
 
-        $domain = bp_core_get_user_domain( $forum_template->topic->topic_last_poster, $forum_template->topic->topic_last_poster_nicename, $forum_template->topic->topic_last_poster_login ) ;
+        $domain = bp_core_get_user_domain( $forum_template->topic->topic_last_poster, $forum_template->topic->topic_last_poster_nicename, $forum_template->topic->topic_last_poster_login );
 
         // In the case where no user is found, bp_core_get_user_domain() may return the URL
         // of the Members directory
-        if ( !$domain || $domain == bp_core_get_root_domain() . '/' . bp_get_members_root_slug() . '/' )
+        if ( empty( $domain ) || ( bp_get_members_directory_permalink() === $domain ) ) {
             return __( 'Deleted User', 'buddypress' );
+        }
 
         /**

trunk/src/bp-members/bp-members-screens.php

@@ -75 +75 @@
     // If the user is logged in, redirect away from here
     if ( is_user_logged_in() ) {
-        if ( bp_is_component_front_page( 'register' ) )
-            $redirect_to = trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() );
-        else
-            $redirect_to = bp_get_root_domain();
+
+        $redirect_to = bp_is_component_front_page( 'register' )
+            ? bp_get_members_directory_permalink()
+            : bp_get_root_domain();
 
         /**
@@ -306 +306 @@
         // avoid an infinite loop. Otherwise, set to root domain.
         $redirect_to = bp_is_component_front_page( 'activate' )
-            ? bp_get_root_domain() . '/' . bp_get_members_root_slug()
+            ? bp_get_members_directory_permalink()
             : bp_get_root_domain();
 

trunk/src/bp-members/bp-members-widgets.php

@@ -64 +64 @@
         echo $before_widget;
 
-        $title = $instance['link_title'] ? '<a href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) . '">' . $title . '</a>' : $title;
+        $title = $instance['link_title'] ? '<a href="' . bp_get_members_directory_permalink() . '">' . $title . '</a>' : $title;
 
         echo $before_title