<!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][7350] trunk/bp-groups: Fix E_STRICT warnings in group creation code from using functions like array_shift() and array_pop() that expect references rather than results of array_keys().</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7350">7350</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-08-19 18:26:37 +0000 (Mon, 19 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix E_STRICT warnings in group creation code from using functions like array_shift() and array_pop() that expect references rather than results of array_keys(). See <a href="http://buddypress.trac.wordpress.org/ticket/5108">#5108</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsactionsphp">trunk/bp-groups/bp-groups-actions.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-actions.php (7349 => 7350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-actions.php 2013-08-12 22:53:30 UTC (rev 7349)
+++ trunk/bp-groups/bp-groups-actions.php 2013-08-19 18:26:37 UTC (rev 7350)
</span><span class="lines">@@ -42,7 +42,9 @@
</span><span class="cx"> setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH );
</span><span class="cx">
</span><span class="cx"> $reset_steps = true;
</span><del>- bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . array_shift( array_keys( $bp->groups->group_creation_steps ) ) . '/' );
</del><ins>+ $step = array_keys( $bp->groups->group_creation_steps );
+ $redirect_to = bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . $step[0] . '/';
+ bp_core_redirect( $redirect_to );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If this is a creation step that is not recognized, just redirect them back to the first screen
</span><span class="lines">@@ -133,7 +135,8 @@
</span><span class="cx">
</span><span class="cx"> // If we have completed all steps and hit done on the final step we
</span><span class="cx"> // can redirect to the completed group
</span><del>- if ( count( $bp->groups->completed_create_steps ) == count( $bp->groups->group_creation_steps ) && bp_get_groups_current_create_step() == array_pop( array_keys( $bp->groups->group_creation_steps ) ) ) {
</del><ins>+ $keys = array_keys( $bp->groups->group_creation_steps );
+ if ( count( $bp->groups->completed_create_steps ) == count( $keys ) && bp_get_groups_current_create_step() == array_pop( $keys ) ) {
</ins><span class="cx"> unset( $bp->groups->current_create_step );
</span><span class="cx"> unset( $bp->groups->completed_create_steps );
</span><span class="cx">
</span><span class="lines">@@ -152,7 +155,7 @@
</span><span class="cx"> * Since we don't know what the next step is going to be (any plugin can insert steps)
</span><span class="cx"> * we need to loop the step array and fetch the next step that way.
</span><span class="cx"> */
</span><del>- foreach ( (array) $bp->groups->group_creation_steps as $key => $value ) {
</del><ins>+ foreach ( $keys as $key ) {
</ins><span class="cx"> if ( $key == bp_get_groups_current_create_step() ) {
</span><span class="cx"> $next = 1;
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (7349 => 7350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2013-08-12 22:53:30 UTC (rev 7349)
+++ trunk/bp-groups/bp-groups-template.php 2013-08-19 18:26:37 UTC (rev 7350)
</span><span class="lines">@@ -2204,8 +2204,10 @@
</span><span class="cx"> if ( !is_array( $bp->groups->group_creation_steps ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( !bp_get_groups_current_create_step() )
- $bp->groups->current_create_step = array_shift( array_keys( $bp->groups->group_creation_steps ) );
</del><ins>+ if ( !bp_get_groups_current_create_step() ) {
+ $keys = array_keys( $bp->groups->group_creation_steps );
+ $bp->groups->current_create_step = array_shift( $keys );
+ }
</ins><span class="cx">
</span><span class="cx"> $counter = 1;
</span><span class="cx">
</span><span class="lines">@@ -2233,8 +2235,10 @@
</span><span class="cx"> function bp_get_group_creation_form_action() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !bp_action_variable( 1 ) )
- $bp->action_variables[1] = array_shift( array_keys( $bp->groups->group_creation_steps ) );
</del><ins>+ if ( !bp_action_variable( 1 ) ) {
+ $keys = array_keys( $bp->groups->group_creation_steps );
+ $bp->action_variables[1] = array_shift( $keys );
+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_group_creation_form_action', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_action_variable( 1 ) ) );
</span><span class="cx"> }
</span><span class="lines">@@ -2247,7 +2251,8 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* If this the first step, we can just accept and return true */
</span><del>- if ( !bp_action_variable( 1 ) && array_shift( array_keys( $bp->groups->group_creation_steps ) ) == $step_slug )
</del><ins>+ $keys = array_keys( $bp->groups->group_creation_steps );
+ if ( !bp_action_variable( 1 ) && array_shift( $keys ) == $step_slug )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> /* Before allowing a user to see a group creation step we must make sure previous steps are completed */
</span><span class="lines">@@ -2289,7 +2294,8 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> /* If this is the first group creation step, return true */
</span><del>- if ( array_shift( array_keys( $bp->groups->group_creation_steps ) ) == $step_slug )
</del><ins>+ $keys = array_keys( $bp->groups->group_creation_steps );
+ if ( array_shift( $keys ) == $step_slug )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> reset( $bp->groups->group_creation_steps );
</span><span class="lines">@@ -2433,7 +2439,8 @@
</span><span class="cx"> function bp_is_last_group_creation_step() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $last_step = array_pop( array_keys( $bp->groups->group_creation_steps ) );
</del><ins>+ $keys = array_keys( $bp->groups->group_creation_steps );
+ $last_step = array_pop( $keys );
</ins><span class="cx">
</span><span class="cx"> if ( $last_step == bp_get_groups_current_create_step() )
</span><span class="cx"> return true;
</span><span class="lines">@@ -2444,7 +2451,8 @@
</span><span class="cx"> function bp_is_first_group_creation_step() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $first_step = array_shift( array_keys( $bp->groups->group_creation_steps ) );
</del><ins>+ $keys = array_keys( $bp->groups->group_creation_steps );
+ $first_step = array_shift( $keys );
</ins><span class="cx">
</span><span class="cx"> if ( $first_step == bp_get_groups_current_create_step() )
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>