<!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][12983] trunk/src/bp-templates/bp-nouveau/includes/classes.php: BP Nouveau: improve the `update()` method of the `BP_Buttons_Group`</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/12983">12983</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/12983","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>2021-07-01 20:54:10 +0000 (Thu, 01 Jul 2021)</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'>BP Nouveau: improve the `update()` method of the `BP_Buttons_Group`
- Create a new method to add buttons.
- Use it into the `update()` method to allow it to add new buttons to pre-existing ones.
Props sbrajesh
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8499">#8499</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveauincludesclassesphp">trunk/src/bp-templates/bp-nouveau/includes/classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveauincludesclassesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/classes.php 2021-07-01 20:22:45 UTC (rev 12982)
+++ trunk/src/bp-templates/bp-nouveau/includes/classes.php 2021-07-01 20:54:10 UTC (rev 12983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Common Classes
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 9.0.0
</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"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,47 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $args as $arg ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = bp_parse_args(
- (array) $arg,
- array(
- 'id' => '',
- 'position' => 99,
- 'component' => '',
- 'must_be_logged_in' => true,
- 'block_self' => false,
- 'parent_element' => false,
- 'parent_attr' => array(),
- 'button_element' => 'a',
- 'button_attr' => array(),
- 'link_text' => '',
- ),
- 'buttons_group_constructor'
- );
-
- // Just don't set the button if a param is missing
- if ( empty( $r['id'] ) || empty( $r['component'] ) || empty( $r['link_text'] ) ) {
- continue;
- }
-
- $r['id'] = sanitize_key( $r['id'] );
-
- // If the button already exist don't add it
- if ( isset( $this->group[ $r['id'] ] ) ) {
- continue;
- }
-
- /*
- * If, in bp_nouveau_get_*_buttons(), we pass through a false value for 'parent_element'
- * but we have attributtes for it in the array, let's default to setting a div.
- *
- * Otherwise, the original false value will be passed through to BP buttons.
- * @todo: this needs review, probably trying to be too clever
- */
- if ( ( ! empty( $r['parent_attr'] ) ) && false === $r['parent_element'] ) {
- $r['parent_element'] = 'div';
- }
-
- $this->group[ $r['id'] ] = $r;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add( $arg );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,9 +132,64 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->group[ $id ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'buttons_group_update'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $this->add( $params );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Adds a button.
+ *
+ * @since 9.0.0
+ *
+ * @param array $args Required. See the __constructor for a description of this argument.
+ * @return bool true on success, false on failure to add.
+ */
+ private function add( $args ) {
+ $r = bp_parse_args(
+ (array) $args,
+ array(
+ 'id' => '',
+ 'position' => 99,
+ 'component' => '',
+ 'must_be_logged_in' => true,
+ 'block_self' => false,
+ 'parent_element' => false,
+ 'parent_attr' => array(),
+ 'button_element' => 'a',
+ 'button_attr' => array(),
+ 'link_text' => '',
+ ),
+ 'buttons_group_constructor'
+ );
+
+ // Just don't set the button if a param is missing
+ if ( empty( $r['id'] ) || empty( $r['component'] ) || empty( $r['link_text'] ) ) {
+ return false;
+ }
+
+ $r['id'] = sanitize_key( $r['id'] );
+
+ // If the button already exist don't add it
+ if ( isset( $this->group[ $r['id'] ] ) ) {
+ return false;
+ }
+
+ /*
+ * If, in bp_nouveau_get_*_buttons(), we pass through a false value for 'parent_element'
+ * but we have attributtes for it in the array, let's default to setting a div.
+ *
+ * Otherwise, the original false value will be passed through to BP buttons.
+ * @todo: this needs review, probably trying to be too clever
+ */
+ if ( ( ! empty( $r['parent_attr'] ) ) && false === $r['parent_element'] ) {
+ $r['parent_element'] = 'div';
+ }
+
+ $this->group[ $r['id'] ] = $r;
+ return true;
+ }
</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>
</div>
</body>
</html>