<!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][6129] trunk/bp-activity: Fix 'number of columns' screen option.</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/6129">6129</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-06-21 20:42:47 +0000 (Thu, 21 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix 'number of columns' screen option. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4287">#4287</a>.
* This was caused by a change in WP 3.4, and brings our admin screen back in line with core.
* #WP21042</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpactivitybpactivityakismetphp">trunk/bp-activity/bp-activity-akismet.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (6128 => 6129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2012-06-21 19:36:28 UTC (rev 6128)
+++ trunk/bp-activity/bp-activity-admin.php 2012-06-21 20:42:47 UTC (rev 6129)
</span><span class="lines">@@ -200,10 +200,10 @@
</span><span class="cx">
</span><span class="cx"> // Register metaboxes for the edit screen.
</span><span class="cx"> add_meta_box( 'submitdiv', _x( 'Status', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_status', 'toplevel_page_bp-activity', 'side', 'core' );
</span><del>- add_meta_box( 'bp_activity_itemids', _x( 'Primary Item/Secondary Item', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_itemids', 'toplevel_page_bp-activity', 'advanced', 'core' );
- add_meta_box( 'bp_activity_link', _x( 'Link', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_link', 'toplevel_page_bp-activity', 'advanced', 'core' );
- add_meta_box( 'bp_activity_type', _x( 'Type', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_type', 'toplevel_page_bp-activity', 'advanced', 'core' );
- add_meta_box( 'bp_activity_userid', _x( 'Author ID', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_userid', 'toplevel_page_bp-activity', 'advanced', 'core' );
</del><ins>+ add_meta_box( 'bp_activity_itemids', _x( 'Primary Item/Secondary Item', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_itemids', 'toplevel_page_bp-activity', 'normal', 'core' );
+ add_meta_box( 'bp_activity_link', _x( 'Link', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_link', 'toplevel_page_bp-activity', 'normal', 'core' );
+ add_meta_box( 'bp_activity_type', _x( 'Type', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_type', 'toplevel_page_bp-activity', 'normal', 'core' );
+ add_meta_box( 'bp_activity_userid', _x( 'Author ID', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_userid', 'toplevel_page_bp-activity', 'normal', 'core' );
</ins><span class="cx">
</span><span class="cx"> // Enqueue javascripts
</span><span class="cx"> wp_enqueue_script( 'postbox' );
</span><span class="lines">@@ -566,13 +566,10 @@
</span><span class="cx"> <?php if ( ! empty( $activity ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <form action="<?php echo esc_attr( $form_url ); ?>" id="bp-activities-edit-form" method="post">
</span><del>- <div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
- <div id="side-info-column" class="inner-sidebar">
- <?php do_meta_boxes( 'toplevel_page_bp-activity', 'side', $activity ); ?>
- </div>
</del><ins>+ <div id="poststuff">
</ins><span class="cx">
</span><del>- <div id="post-body" class="has-sidebar">
- <div id="post-body-content" class="has-sidebar-content">
</del><ins>+ <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
+ <div id="post-body-content">
</ins><span class="cx"> <div id="postdiv" class="postarea">
</span><span class="cx"> <div id="bp_activity_action" class="postbox">
</span><span class="cx"> <h3><?php _e( 'Action', 'buddypress' ); ?></h3>
</span><span class="lines">@@ -588,12 +585,19 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><ins>+ </div><!-- #post-body-content -->
</ins><span class="cx">
</span><ins>+ <div id="postbox-container-1" class="postbox-container">
+ <?php do_meta_boxes( 'toplevel_page_bp-activity', 'side', $activity ); ?>
+ </div>
+
+ <div id="postbox-container-2" class="postbox-container">
+ <?php do_meta_boxes( 'toplevel_page_bp-activity', 'normal', $activity ); ?>
</ins><span class="cx"> <?php do_meta_boxes( 'toplevel_page_bp-activity', 'advanced', $activity ); ?>
</span><span class="cx"> </div>
</span><del>- </div>
- </div>
</del><ins>+ </div><!-- #post-body -->
</ins><span class="cx">
</span><ins>+ </div><!-- #poststuff -->
</ins><span class="cx"> <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
</span><span class="cx"> <?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
</span><span class="cx"> <?php wp_nonce_field( 'edit-activity_' . $activity->id ); ?>
</span><span class="lines">@@ -603,7 +607,7 @@
</span><span class="cx"> <p><?php printf( __( 'No activity found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), network_admin_url( 'admin.php?page=bp-activity' ) ); ?></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- </div>
</del><ins>+ </div><!-- .wrap -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivityakismetphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-akismet.php (6128 => 6129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-akismet.php 2012-06-21 19:36:28 UTC (rev 6128)
+++ trunk/bp-activity/bp-activity-akismet.php 2012-06-21 20:42:47 UTC (rev 6129)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Display meta box with a low priority (low position on screen by default)
</span><del>- add_meta_box( 'bp_activity_history', __( 'Activity History', 'buddypress' ), array( $this, 'history_metabox' ), 'toplevel_page_bp-activity', 'advanced', 'low' );
</del><ins>+ add_meta_box( 'bp_activity_history', __( 'Activity History', 'buddypress' ), array( $this, 'history_metabox' ), 'toplevel_page_bp-activity', 'normal', 'low' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>