<!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][9350] trunk/src/bp-messages/bp-messages-template.php: Improvements to `BP_Messages_Box_Template::__construct()`:</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/9350">9350</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/9350","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-01-12 23:11:38 +0000 (Mon, 12 Jan 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'>Improvements to `BP_Messages_Box_Template::__construct()`:

* Update `$max` to `$r['max']` fixing potential for `total_count` to be incorrect.
* Strict comparisons where appropriate.
* Cast `$r['max']` to int where appropriate.
* Bring surrounding code up to current coding standards.

Similar to <a href="http://buddypress.trac.wordpress.org/changeset/8578">r8578</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmessagesbpmessagestemplatephp">trunk/src/bp-messages/bp-messages-template.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-template.php    2015-01-12 23:04:35 UTC (rev 9349)
+++ trunk/src/bp-messages/bp-messages-template.php      2015-01-12 23:11:38 UTC (rev 9350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,6 @@
</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">        public function __construct( $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                global $wpdb, $bp;
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Backward compatibility with old method of passing arguments
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_array( $args ) || func_num_args() > 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,36 +139,36 @@
</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">                $r = wp_parse_args( $args, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'user_id'  => bp_loggedin_user_id(),
-                       'box'      => 'inbox',
-                       'per_page' => 10,
-                       'max'      => false,
-                       'type'     => 'all',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'user_id'      => bp_loggedin_user_id(),
+                       'box'          => 'inbox',
+                       'per_page'     => 10,
+                       'max'          => false,
+                       'type'         => 'all',
</ins><span class="cx" style="display: block; padding: 0 10px">                         'search_terms' => '',
</span><span class="cx" style="display: block; padding: 0 10px">                        'page_arg'     => 'mpage',
</span><span class="cx" style="display: block; padding: 0 10px">                        'meta_query'   => array(),
</span><span class="cx" style="display: block; padding: 0 10px">                ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->pag_page = isset( $_GET[ $r['page_arg'] ] ) ? intval( $_GET[ $r['page_arg'] ] ) : 1;
-               $this->pag_num  = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $r['per_page'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->pag_page     = isset( $_GET[ $r['page_arg'] ] ) ? intval( $_GET[ $r['page_arg'] ] ) : 1;
+               $this->pag_num      = isset( $_GET['num']            ) ? intval( $_GET['num']            ) : $r['per_page'];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $this->user_id      = $r['user_id'];
</span><span class="cx" style="display: block; padding: 0 10px">                $this->box          = $r['box'];
</span><span class="cx" style="display: block; padding: 0 10px">                $this->type         = $r['type'];
</span><span class="cx" style="display: block; padding: 0 10px">                $this->search_terms = $r['search_terms'];
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( 'notices' == $this->box ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'notices' === $this->box ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->threads = BP_Messages_Notice::get_notices( array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'pag_num'  => $this->pag_num,
</span><span class="cx" style="display: block; padding: 0 10px">                                'pag_page' => $this->pag_page
</span><span class="cx" style="display: block; padding: 0 10px">                        ) );
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        $threads = BP_Messages_Thread::get_current_threads_for_user( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'user_id' => $this->user_id,
-                               'box'     => $this->box,
-                               'type'    => $this->type,
-                               'limit'   => $this->pag_num,
-                               'page'    => $this->pag_page,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'user_id'      => $this->user_id,
+                               'box'          => $this->box,
+                               'type'         => $this->type,
+                               'limit'        => $this->pag_num,
+                               'page'         => $this->pag_page,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 'search_terms' => $this->search_terms,
</span><span class="cx" style="display: block; padding: 0 10px">                                'meta_query'   => $r['meta_query'],
</span><span class="cx" style="display: block; padding: 0 10px">                        ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,16 +183,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        $total_notice_count = BP_Messages_Notice::get_total_notice_count();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! $r['max'] || $r['max'] >= (int) $total_notice_count ) {
-                               if ( 'notices' == $this->box ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( empty( $r['max'] ) || ( (int) $r['max'] >= (int) $total_notice_count ) ) {
+                               if ( 'notices' === $this->box ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $this->total_thread_count = (int) $total_notice_count;
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                $this->total_thread_count = (int) $r['max'];
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $r['max'] ) {
-                               if ( $max >= count( $this->threads ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! empty( $r['max'] ) ) {
+                               if ( (int) $r['max'] >= count( $this->threads ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $this->thread_count = count( $this->threads );
</span><span class="cx" style="display: block; padding: 0 10px">                                } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                        $this->thread_count = (int) $r['max'];
</span></span></pre>
</div>
</div>

</body>
</html>