<!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][6309] trunk: Group Admin:</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/6309">6309</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-09-06 03:48:42 +0000 (Thu, 06 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Group Admin:
* Only include group admin UI if in wp-admin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsadminphp">trunk/bp-groups/bp-groups-admin.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 (6308 => 6309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2012-09-05 22:36:26 UTC (rev 6308)
+++ trunk/bp-activity/bp-activity-admin.php 2012-09-06 03:48:42 UTC (rev 6309)
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><del>- <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>
</del><ins>+ <p><?php printf( __( 'No activity found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), esc_url( bp_get_admin_url( 'admin.php?page=bp-activity' ) ) ); ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .wrap -->
</span><span class="lines">@@ -874,7 +874,7 @@
</span><span class="cx"> <a href="#" class="cancel button-secondary alignleft"><?php _e( 'Cancel', 'buddypress' ); ?></a>
</span><span class="cx"> <a href="#" class="save button-primary alignright"><?php _e( 'Reply', 'buddypress' ); ?></a>
</span><span class="cx">
</span><del>- <img class="waiting" style="display:none;" src="<?php echo esc_url( network_admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</del><ins>+ <img class="waiting" style="display:none;" src="<?php echo esc_url( bp_get_admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <span class="error" style="display:none;"></span>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </p>
</span><span class="lines">@@ -1265,7 +1265,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Build actions URLs
</span><del>- $base_url = network_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
</del><ins>+ $base_url = bp_get_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
</ins><span class="cx"> $spam_nonce = esc_html( '_wpnonce=' . wp_create_nonce( 'spam-activity_' . $item['id'] ) );
</span><span class="cx">
</span><span class="cx"> $delete_url = $base_url . "&amp;action=delete&amp;$spam_nonce";
</span><span class="lines">@@ -1324,12 +1324,12 @@
</span><span class="cx"> // Is $item is a root activity?
</span><span class="cx"> if ( empty( $item['item_id'] ) || ! in_array( $item['type'], apply_filters( 'bp_activity_admin_root_activity_types', array( 'activity_comment' ), $item ) ) ) {
</span><span class="cx"> $comment_count = !empty( $item['children'] ) ? bp_activity_recurse_comment_count( (object) $item ) : 0;
</span><del>- $root_activity_url = network_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
</del><ins>+ $root_activity_url = bp_get_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
</ins><span class="cx">
</span><span class="cx"> // If the activity has comments, display a link to the activity's permalink, with its comment count in a speech bubble
</span><span class="cx"> if ( $comment_count ) {
</span><span class="cx"> $title_attr = sprintf( _n( '%s related activity', '%s related activities', $comment_count, 'buddypress' ), number_format_i18n( $comment_count ) );
</span><del>- printf( '<a href="%1$s" title="%2$s" class="post-com-count"><span class="comment-count">%3$s</span></a>', esc_attr( $root_activity_url ), esc_attr( $title_attr ), number_format_i18n( $comment_count ) );
</del><ins>+ printf( '<a href="%1$s" title="%2$s" class="post-com-count"><span class="comment-count">%3$s</span></a>', esc_url( $root_activity_url ), esc_attr( $title_attr ), number_format_i18n( $comment_count ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // For non-root activities, display a link to the replied-to activity's author's profile
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-admin.php (6308 => 6309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-admin.php 2012-09-05 22:36:26 UTC (rev 6308)
+++ trunk/bp-groups/bp-groups-admin.php 2012-09-06 03:48:42 UTC (rev 6309)
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><del>- <p><?php printf( __( 'No group found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), network_admin_url( 'admin.php?page=bp-groups' ) ); ?></p>
</del><ins>+ <p><?php printf( __( 'No group found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), esc_url( bp_get_admin_url( 'admin.php?page=bp-groups' ) ) ); ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .wrap -->
</span><span class="lines">@@ -809,8 +809,8 @@
</span><span class="cx"> $base_url = add_query_arg( array(
</span><span class="cx"> 'page' => 'bp-groups',
</span><span class="cx"> 'gid' => $item->id
</span><del>- ), is_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) );
-?>
</del><ins>+ ), bp_get_admin_url( 'admin.php' ) ); ?>
+
</ins><span class="cx"> <div id="submitcomment" class="submitbox">
</span><span class="cx"> <div id="major-publishing-actions">
</span><span class="cx"> <div id="delete-action">
</span><span class="lines">@@ -1200,7 +1200,7 @@
</span><span class="cx"> $item_obj = (object) $item;
</span><span class="cx">
</span><span class="cx"> // Build actions URLs
</span><del>- $base_url = network_admin_url( 'admin.php?page=bp-groups&amp;gid=' . $item['id'] );
</del><ins>+ $base_url = bp_get_admin_url( 'admin.php?page=bp-groups&amp;gid=' . $item['id'] );
</ins><span class="cx">
</span><span class="cx"> $delete_url = wp_nonce_url( $base_url . "&amp;action=delete", 'bp-groups-delete' );
</span><span class="cx"> $edit_url = $base_url . '&amp;action=edit';
</span><span class="lines">@@ -1209,13 +1209,13 @@
</span><span class="cx"> // Rollover actions
</span><span class="cx">
</span><span class="cx"> // Visit
</span><del>- $actions['visit'] = sprintf( '<a href="%s">%s</a>', $visit_url, __( 'Visit', 'buddypress' ) );
</del><ins>+ $actions['visit'] = sprintf( '<a href="%s">%s</a>', esc_url( $visit_url ), __( 'Visit', 'buddypress' ) );
</ins><span class="cx">
</span><span class="cx"> // Edit
</span><del>- $actions['edit'] = sprintf( '<a href="%s">%s</a>', $edit_url, __( 'Edit', 'buddypress' ) );
</del><ins>+ $actions['edit'] = sprintf( '<a href="%s">%s</a>', esc_url( $edit_url ), __( 'Edit', 'buddypress' ) );
</ins><span class="cx">
</span><span class="cx"> // Delete
</span><del>- $actions['delete'] = sprintf( '<a href="%s">%s</a>', $delete_url, __( 'Delete', 'buddypress' ) );
</del><ins>+ $actions['delete'] = sprintf( '<a href="%s">%s</a>', esc_url( $delete_url ), __( 'Delete', 'buddypress' ) );
</ins><span class="cx">
</span><span class="cx"> // Other plugins can filter which actions are shown
</span><span class="cx"> $actions = apply_filters( 'bp_activity_admin_comment_row_actions', array_filter( $actions ), $item );
</span></span></pre>
</div>
</div>
</body>
</html>