<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][9467] trunk/src: Replace all references to `bp_get_root_domain() .</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9467">9467</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9467","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-10 00:12:52 +0000 (Tue, 10 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/4954">#4954</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorecatchuriphp">trunk/src/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunksrcbpcoredeprecated21php">trunk/src/bp-core/deprecated/2.1.php</a></li>
<li><a href="#trunksrcbpforumsbpforumsfiltersphp">trunk/src/bp-forums/bp-forums-filters.php</a></li>
<li><a href="#trunksrcbpforumsbpforumstemplatephp">trunk/src/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersscreensphp">trunk/src/bp-members/bp-members-screens.php</a></li>
<li><a href="#trunksrcbpmembersbpmemberswidgetsphp">trunk/src/bp-members/bp-members-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-catchuri.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-catchuri.php 2015-02-09 23:34:12 UTC (rev 9466)
+++ trunk/src/bp-core/bp-core-catchuri.php 2015-02-10 00:12:52 UTC (rev 9467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,7 +648,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // and the current user is logged in. In this case we send to
</span><span class="cx" style="display: block; padding: 0 10px"> // the members directory to avoid redirect loops
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( bp_is_register_page() && 'register' == $front_page_component && is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp->canonical_stack['canonical_url'] = apply_filters( 'bp_loggedin_register_page_redirect_to', trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp->canonical_stack['canonical_url'] = apply_filters( 'bp_loggedin_register_page_redirect_to', bp_get_members_directory_permalink() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcoredeprecated21php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/deprecated/2.1.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/deprecated/2.1.php 2015-02-09 23:34:12 UTC (rev 9466)
+++ trunk/src/bp-core/deprecated/2.1.php 2015-02-10 00:12:52 UTC (rev 9467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="align-right" id="bp-adminbar-visitrandom-menu">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#"><?php _e( 'Visit', 'buddypress' ) ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="random-list">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><a href="<?php bp_members_directory_permalink(); ?>?random-member" rel="nofollow"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bp_is_active( 'groups' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpforumsbpforumsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-forums/bp-forums-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-forums/bp-forums-filters.php 2015-02-09 23:34:12 UTC (rev 9466)
+++ trunk/src/bp-forums/bp-forums-filters.php 2015-02-10 00:12:52 UTC (rev 9467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,24 +167,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Prevents embedded anchor tags.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global object $bp Global BuddyPress settings object.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $content Edited post content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string $content Sanitized post content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_forums_strip_mentions_on_post_edit( $content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $bp;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = htmlspecialchars_decode( $content );
+ $directory = bp_get_members_directory_permalink();
+ $pattern = "|<a href='{$directory}[A-Za-z0-9-_\.]+/' rel='nofollow'>(@[A-Za-z0-9-_\.@]+)</a>|";
+ $content = preg_replace( $pattern, "$1", $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = htmlspecialchars_decode( $content );
-
- $pattern = "|<a href='" . bp_get_root_domain() . "/" . bp_get_members_root_slug() . "/[A-Za-z0-9-_\.]+/' rel='nofollow'>(@[A-Za-z0-9-_\.@]+)</a>|";
-
- $content = preg_replace( $pattern, "$1", $content );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_the_topic_post_edit_text', 'bp_forums_strip_mentions_on_post_edit' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'bp_get_the_topic_text', 'bp_forums_strip_mentions_on_post_edit' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'bp_get_the_topic_text', 'bp_forums_strip_mentions_on_post_edit' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** "Replied to" SQL filters *************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-forums/bp-forums-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-forums/bp-forums-template.php 2015-02-09 23:34:12 UTC (rev 9466)
+++ trunk/src/bp-forums/bp-forums-template.php 2015-02-10 00:12:52 UTC (rev 9467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1042,12 +1042,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_the_topic_last_poster_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $forum_template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 ) ;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // In the case where no user is found, bp_core_get_user_domain() may return the URL
</span><span class="cx" style="display: block; padding: 0 10px"> // of the Members directory
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$domain || $domain == bp_core_get_root_domain() . '/' . bp_get_members_root_slug() . '/' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $domain ) || ( bp_get_members_directory_permalink() === $domain ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return __( 'Deleted User', 'buddypress' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the linked name of the user who last posted to the current topic in the loop.
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersscreensphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-screens.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-screens.php 2015-02-09 23:34:12 UTC (rev 9466)
+++ trunk/src/bp-members/bp-members-screens.php 2015-02-10 00:12:52 UTC (rev 9467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,11 +74,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the user is logged in, redirect away from here
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect_to = bp_is_component_front_page( 'register' )
+ ? bp_get_members_directory_permalink()
+ : bp_get_root_domain();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the URL to redirect logged in users to when visiting registration page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If activation page is also front page, set to members directory to
</span><span class="cx" style="display: block; padding: 0 10px"> // avoid an infinite loop. Otherwise, set to root domain.
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = bp_is_component_front_page( 'activate' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ? bp_get_root_domain() . '/' . bp_get_members_root_slug()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ? bp_get_members_directory_permalink()
</ins><span class="cx" style="display: block; padding: 0 10px"> : bp_get_root_domain();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Trailing slash it, as we expect these URL's to be
</span></span></pre></div>
<a id="trunksrcbpmembersbpmemberswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-widgets.php 2015-02-09 23:34:12 UTC (rev 9466)
+++ trunk/src/bp-members/bp-members-widgets.php 2015-02-10 00:12:52 UTC (rev 9467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo $before_widget;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = $instance['link_title'] ? '<a href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) . '">' . $title . '</a>' : $title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = $instance['link_title'] ? '<a href="' . bp_get_members_directory_permalink() . '">' . $title . '</a>' : $title;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo $before_title
</span><span class="cx" style="display: block; padding: 0 10px"> . $title
</span></span></pre>
</div>
</div>
</body>
</html>