<!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][13505] trunk/src/bp-blogs/classes/class-bp-blogs-component.php: Blogs: implement Action, Action variables & Create rewrite rules</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 { white-space: pre-line; 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/13505">13505</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/13505","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-22 04:08:38 +0000 (Thu, 22 Jun 2023)</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'>Blogs: implement Action, Action variables & Create rewrite rules
These rules were missed in <a href="http://buddypress.trac.wordpress.org/ticket/4954">#4954</a>
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8925">#8925</a>
Closes https://github.com/buddypress/buddypress/pull/119</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsclassesclassbpblogscomponentphp">trunk/src/bp-blogs/classes/class-bp-blogs-component.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsclassesclassbpblogscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/classes/class-bp-blogs-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/classes/class-bp-blogs-component.php 2023-06-19 18:09:44 UTC (rev 13504)
+++ trunk/src/bp-blogs/classes/class-bp-blogs-component.php 2023-06-22 04:08:38 UTC (rev 13505)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,8 +81,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'root_slug' => isset( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : $default_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_directory' => is_multisite(), // Non-multisite installs don't need a top-level Sites directory, since there's only one site.
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite_ids' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'directory' => 'blogs',
- 'create_single_item' => 'blog_create',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'directory' => 'blogs',
+ 'create_single_item' => 'blog_create',
+ 'directory_action' => 'blogs_action',
+ 'directory_action_variables' => 'blogs_action_variables'
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'directory_title' => isset( $bp->pages->blogs->title ) ? $bp->pages->blogs->title : $default_directory_title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'notification_callback' => 'bp_blogs_format_notifications',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,7 +399,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_rewrite_tags( $rewrite_tags = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite_tags = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'create_single_item' => '([1]{1,})',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'create_single_item' => '([1]{1,})',
+ 'directory_action' => '([^/]+)',
+ 'directory_action_variables' => '(.+?)',
</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"> parent::add_rewrite_tags( $rewrite_tags );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,6 +419,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $create_slug = bp_rewrites_get_slug( 'blogs', 'blog_create', 'create' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite_rules = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'directory_action_variables' => array(
+ 'regex' => $this->root_slug . '/([^/]+)/(.+?)/?$',
+ 'order' => 70,
+ 'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['directory_action'] . '=$matches[1]&' . $this->rewrite_ids['directory_action_variables'] . '=$matches[2]',
+ ),
+ 'directory_action' => array(
+ 'regex' => $this->root_slug . '/([^/]+)/?$',
+ 'order' => 60,
+ 'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['directory_action'] . '=$matches[1]',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'create_single_item' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'regex' => $this->root_slug . '/' . $create_slug . '/?$',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 50,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,23 +466,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 === (int) $query->get( $this->rewrite_ids['directory'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->current_component = 'blogs';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_blog_create = 1 === (int) $query->get( $this->rewrite_ids['create_single_item'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_action = $query->get( $this->rewrite_ids['single_item_action'] );
- if ( $current_action ) {
- $bp->current_action = $current_action;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_blog_create ) {
+ $bp->current_action = 'create';
+ } else {
+ $current_action = $query->get( $this->rewrite_ids['directory_action'] );
+ if ( $current_action ) {
+ $bp->current_action = $current_action;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action_variables = $query->get( $this->rewrite_ids['single_item_action_variables'] );
- if ( $action_variables ) {
- if ( ! is_array( $action_variables ) ) {
- $bp->action_variables = explode( '/', ltrim( $action_variables, '/' ) );
- } else {
- $bp->action_variables = $action_variables;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_variables = $query->get( $this->rewrite_ids['directory_action_variables'] );
+ if ( $action_variables ) {
+ if ( ! is_array( $action_variables ) ) {
+ $bp->action_variables = explode( '/', ltrim( $action_variables, '/' ) );
+ } else {
+ $bp->action_variables = $action_variables;
+ }
</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 class="cx" style="display: block; padding: 0 10px"> // Set the BuddyPress queried object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $bp->pages->blogs->id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $bp->pages->blogs->id ) && ( ! bp_current_action() || bp_is_current_action( 'create' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->queried_object = get_post( $bp->pages->blogs->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $query->queried_object_id = $query->queried_object->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>