<!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][6086] branches/1.5: WP Version Check:</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, #logmsg > ol { margin-left: 0; 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/6086">6086</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-06-13 20:46:17 +0000 (Wed, 13 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP Version Check:
* Fixes missing notifications menu.
* Fixes missing groups menu.
* Correctly compares floats as numbers.
* Fix non-yoda comparisons.
* Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4255">#4255</a> (1.5 branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches15bpcorebpcoreadminbarphp">branches/1.5/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#branches15bpgroupsbpgroupsadminbarphp">branches/1.5/bp-groups/bp-groups-adminbar.php</a></li>
<li><a href="#branches15bpmembersbpmembersadminbarphp">branches/1.5/bp-members/bp-members-adminbar.php</a></li>
<li><a href="#branches15bpthemesbpdefaultfunctionsphp">branches/1.5/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches15bpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-core/bp-core-adminbar.php (6085 => 6086)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-core/bp-core-adminbar.php 2012-06-13 20:36:16 UTC (rev 6085)
+++ branches/1.5/bp-core/bp-core-adminbar.php 2012-06-13 20:46:17 UTC (rev 6086)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * @since BuddyPress (1.5.2)
</span><span class="cx"> */
</span><span class="cx"> function bp_core_admin_bar_version_check() {
</span><del>- if ( '3.2' == bp_get_major_wp_version() ) {
</del><ins>+ if ( 3.2 == bp_get_major_wp_version() ) {
</ins><span class="cx"> add_action( 'bp_setup_admin_bar', 'bp_admin_bar_root_site', 3 );
</span><span class="cx"> add_action( 'bp_setup_admin_bar', 'bp_admin_bar_comments_menu', 3 );
</span><span class="cx"> add_action( 'bp_setup_admin_bar', 'bp_admin_bar_appearance_menu', 3 );
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_admin_bar_remove_wp_menus() {
</span><span class="cx">
</span><del>- if ( '3.2' == bp_get_major_wp_version() ) {
</del><ins>+ if ( 3.2 == bp_get_major_wp_version() ) {
</ins><span class="cx"> remove_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 10 );
</span><span class="cx"> remove_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
</span><span class="cx"> remove_action( 'admin_bar_menu', 'wp_admin_bar_dashboard_view_site_menu', 25 );
</span></span></pre></div>
<a id="branches15bpgroupsbpgroupsadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-groups/bp-groups-adminbar.php (6085 => 6086)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-groups/bp-groups-adminbar.php 2012-06-13 20:36:16 UTC (rev 6085)
+++ branches/1.5/bp-groups/bp-groups-adminbar.php 2012-06-13 20:46:17 UTC (rev 6086)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> if ( !is_super_admin() && !bp_group_is_admin() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( '3.2' == bp_get_major_wp_version() ) {
</del><ins>+ if ( 3.2 == bp_get_major_wp_version() ) {
</ins><span class="cx">
</span><span class="cx"> // Group avatar
</span><span class="cx"> $avatar = bp_core_fetch_avatar( array(
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> 'href' => bp_get_group_permalink( $bp->groups->current_group )
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- } elseif ( '3.3' == bp_get_major_wp_version() ) {
</del><ins>+ } elseif ( 3.3 <= bp_get_major_wp_version() ) {
</ins><span class="cx">
</span><span class="cx"> // Unique ID for the 'My Account' menu
</span><span class="cx"> $bp->group_admin_menu_id = 'group-admin';
</span></span></pre></div>
<a id="branches15bpmembersbpmembersadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-members/bp-members-adminbar.php (6085 => 6086)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-members/bp-members-adminbar.php 2012-06-13 20:36:16 UTC (rev 6085)
+++ branches/1.5/bp-members/bp-members-adminbar.php 2012-06-13 20:46:17 UTC (rev 6086)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> // Logged in user
</span><span class="cx"> if ( is_user_logged_in() ) {
</span><span class="cx">
</span><del>- if ( '3.2' == bp_get_major_wp_version() ) {
</del><ins>+ if ( 3.2 == bp_get_major_wp_version() ) {
</ins><span class="cx">
</span><span class="cx"> // User avatar
</span><span class="cx"> $avatar = bp_core_fetch_avatar( array(
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> if ( !current_user_can( 'edit_users' ) || bp_is_my_profile() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( '3.2' == bp_get_major_wp_version() ) {
</del><ins>+ if ( 3.2 == bp_get_major_wp_version() ) {
</ins><span class="cx">
</span><span class="cx"> // User avatar
</span><span class="cx"> $avatar = bp_core_fetch_avatar( array(
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> 'href' => bp_displayed_user_domain()
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- } elseif ( '3.3' == bp_get_major_wp_version() ) {
</del><ins>+ } elseif ( 3.3 <= bp_get_major_wp_version() ) {
</ins><span class="cx">
</span><span class="cx"> // Unique ID for the 'My Account' menu
</span><span class="cx"> $bp->user_admin_menu_id = 'user-admin';
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> $menu_title = __( 'Notifications', 'buddypress' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( '3.2' == bp_get_major_wp_version() ) {
</del><ins>+ if ( 3.2 == bp_get_major_wp_version() ) {
</ins><span class="cx">
</span><span class="cx"> // Add the top-level Notifications button
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> 'href' => bp_loggedin_user_domain()
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- } elseif ( '3.3' == bp_get_major_wp_version() ) {
</del><ins>+ } elseif ( 3.3 == bp_get_major_wp_version() ) {
</ins><span class="cx">
</span><span class="cx"> // Add the top-level Notifications button
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span></span></pre></div>
<a id="branches15bpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-themes/bp-default/functions.php (6085 => 6086)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-themes/bp-default/functions.php 2012-06-13 20:36:16 UTC (rev 6085)
+++ branches/1.5/bp-themes/bp-default/functions.php 2012-06-13 20:46:17 UTC (rev 6086)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> // This theme allows users to set a custom background
</span><span class="cx"> // Backward-compatibility with WP < 3.4 will be removed in a future release
</span><del>- if ( bp_get_major_wp_version() >= 3.4 ) {
</del><ins>+ if ( 3.4 <= bp_get_major_wp_version() ) {
</ins><span class="cx"> $custom_background_args = array(
</span><span class="cx"> 'wp-head-callback' => 'bp_dtheme_custom_background_style'
</span><span class="cx"> );
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> // Add a way for the custom header to be styled in the admin panel that controls custom headers.
</span><span class="cx"> // Backward-compatibility with WP < 3.4 will be removed in a future release
</span><del>- if ( bp_get_major_wp_version() >= 3.4 ) {
</del><ins>+ if ( 3.4 <= bp_get_major_wp_version() ) {
</ins><span class="cx"> $custom_header_args = array(
</span><span class="cx"> 'wp-head-callback' => 'bp_dtheme_header_style',
</span><span class="cx"> 'admin-head-callback' => 'bp_dtheme_admin_header_style'
</span></span></pre>
</div>
</div>
</body>
</html>