<!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][6133] trunk: Fix missing screen options in the Activity admin on multisite.</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/6133">6133</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-06-24 20:18:36 +0000 (Sun, 24 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix missing screen options in the Activity admin on multisite. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4288">#4288</a></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>
<li><a href="#trunkbpcoreadmincsscommondevcss">trunk/bp-core/admin/css/common.dev.css</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 (6132 => 6133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2012-06-23 11:36:19 UTC (rev 6132)
+++ trunk/bp-activity/bp-activity-admin.php 2012-06-24 20:18:36 UTC (rev 6133)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> * @since 1.0
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_admin_edit_hidden_metaboxes( $hidden, $screen ) {
</span><del>- if ( empty( $screen->id ) || 'toplevel_page_bp-activity' != $screen->id )
</del><ins>+ if ( empty( $screen->id ) || 'toplevel_page_bp-activity' != $screen->id && 'toplevel_page_bp-activity_network' != $screen->id )
</ins><span class="cx"> return $hidden;
</span><span class="cx">
</span><span class="cx"> // Hide the primary link meta box by default
</span><span class="lines">@@ -199,11 +199,11 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register metaboxes for the edit screen.
</span><del>- add_meta_box( 'submitdiv', _x( 'Status', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_status', 'toplevel_page_bp-activity', 'side', 'core' );
- 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' );
</del><ins>+ add_meta_box( 'submitdiv', _x( 'Status', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_status', get_current_screen()->id, 'side', 'core' );
+ add_meta_box( 'bp_activity_itemids', _x( 'Primary Item/Secondary Item', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_itemids', get_current_screen()->id, 'normal', 'core' );
+ add_meta_box( 'bp_activity_link', _x( 'Link', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_link', get_current_screen()->id, 'normal', 'core' );
+ add_meta_box( 'bp_activity_type', _x( 'Type', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_type', get_current_screen()->id, 'normal', 'core' );
+ add_meta_box( 'bp_activity_userid', _x( 'Author ID', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_userid', get_current_screen()->id, 'normal', 'core' );
</ins><span class="cx">
</span><span class="cx"> // Enqueue javascripts
</span><span class="cx"> wp_enqueue_script( 'postbox' );
</span><span class="lines">@@ -588,12 +588,12 @@
</span><span class="cx"> </div><!-- #post-body-content -->
</span><span class="cx">
</span><span class="cx"> <div id="postbox-container-1" class="postbox-container">
</span><del>- <?php do_meta_boxes( 'toplevel_page_bp-activity', 'side', $activity ); ?>
</del><ins>+ <?php do_meta_boxes( get_current_screen()->id, 'side', $activity ); ?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="postbox-container-2" class="postbox-container">
</span><del>- <?php do_meta_boxes( 'toplevel_page_bp-activity', 'normal', $activity ); ?>
- <?php do_meta_boxes( 'toplevel_page_bp-activity', 'advanced', $activity ); ?>
</del><ins>+ <?php do_meta_boxes( get_current_screen()->id, 'normal', $activity ); ?>
+ <?php do_meta_boxes( get_current_screen()->id, 'advanced', $activity ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div><!-- #post-body -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivitybpactivityakismetphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-akismet.php (6132 => 6133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-akismet.php 2012-06-23 11:36:19 UTC (rev 6132)
+++ trunk/bp-activity/bp-activity-akismet.php 2012-06-24 20:18:36 UTC (rev 6133)
</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', 'normal', 'low' );
</del><ins>+ add_meta_box( 'bp_activity_history', __( 'Activity History', 'buddypress' ), array( $this, 'history_metabox' ), get_current_screen()->id, 'normal', 'low' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpcoreadmincsscommondevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/css/common.dev.css (6132 => 6133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/css/common.dev.css 2012-06-23 11:36:19 UTC (rev 6132)
+++ trunk/bp-core/admin/css/common.dev.css 2012-06-24 20:18:36 UTC (rev 6133)
</span><span class="lines">@@ -51,16 +51,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Activity */
</span><del>-ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a img {
</del><ins>+ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a img,
+ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image a img {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>-ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a {
</del><ins>+ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image a {
</ins><span class="cx"> background-image: url( ../images/menu.png ) !important;
</span><span class="cx"> background-position: 0 -34px;
</span><span class="cx"> }
</span><span class="cx"> ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image a,
</span><span class="cx"> ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image a,
</span><del>-ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image a {
</del><ins>+ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image a {
</ins><span class="cx"> background-position: 0 -2px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>