<!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][4665] trunk/bp-core/admin/bp-core-admin.php: Tweak admin component page settings to save without conflicting with components.</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/4665">4665</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-07-16 22:17:36 +0000 (Sat, 16 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak admin component page settings to save without conflicting with components. Also add additonal UI elements to save individual pages, to prevent accidental clicking of the 'New Page' button.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-admin.php (4664 => 4665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2011-07-16 21:53:56 UTC (rev 4664)
+++ trunk/bp-core/admin/bp-core-admin.php 2011-07-16 22:17:36 UTC (rev 4665)
</span><span class="lines">@@ -181,13 +181,29 @@
</span><span class="cx"> require_once( BP_PLUGIN_DIR . '/bp-core/admin/bp-core-update.php' );
</span><span class="cx"> $bp->active_components = stripslashes_deep( $_POST['bp_components'] );
</span><span class="cx"> bp_core_install( $bp->active_components );
</span><del>-
</del><ins>+
</ins><span class="cx"> bp_update_option( 'bp-active-components', $bp->active_components );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-general-settings', 'updated' => 'true' ), 'admin.php' ) );
+
+ wp_redirect( $base_url );
+ }
+}
+add_action( 'admin_init', 'bp_core_admin_component_setup_handler' );
+
+function bp_core_admin_pages_setup_handler() {
+ global $wpdb, $bp;
+
+ if ( isset( $_POST['bp-admin-pages-submit'] ) ) {
+ if ( !check_admin_referer('bp-admin-pages-setup') )
+ return false;
+
</ins><span class="cx"> // Then, update the directory pages
</span><span class="cx"> if ( isset( $_POST['bp_pages'] ) ) {
</span><ins>+
</ins><span class="cx"> $directory_pages = array();
</span><ins>+
</ins><span class="cx"> foreach ( (array)$_POST['bp_pages'] as $key => $value ) {
</span><span class="cx"> if ( !empty( $value ) ) {
</span><span class="cx"> $directory_pages[$key] = (int)$value;
</span><span class="lines">@@ -196,12 +212,12 @@
</span><span class="cx"> bp_core_update_page_meta( $directory_pages );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $base_url = bp_get_admin_url( 'admin.php' );
</del><ins>+ $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings', 'updated' => 'true' ), 'admin.php' ) );
</ins><span class="cx">
</span><del>- wp_redirect( add_query_arg( array( 'page' => 'bp-general-settings', 'updated' => 'true' ), $base_url ) );
</del><ins>+ wp_redirect( $base_url );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'admin_init', 'bp_core_admin_component_setup_handler' );
</del><ins>+add_action( 'admin_init', 'bp_core_admin_pages_setup_handler' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Renders the Component Setup admin panel.
</span><span class="lines">@@ -290,10 +306,10 @@
</span><span class="cx"> <?php bp_core_admin_page_options(); ?>
</span><span class="cx">
</span><span class="cx"> <p class="submit clear">
</span><del>- <input class="button-primary" type="submit" name="bp-admin-page-submit" id="bp-admin-page-submit" value="<?php _e( 'Save Settings', 'buddypress' ) ?>"/>
</del><ins>+ <input class="button-primary" type="submit" name="bp-admin-page-submit" id="bp-admin-page-submit" value="<?php _e( 'Save All', 'buddypress' ) ?>"/>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><del>- <?php wp_nonce_field( 'bp-admin-page-setup' ); ?>
</del><ins>+ <?php wp_nonce_field( 'bp-admin-pages-setup' ); ?>
</ins><span class="cx">
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="lines">@@ -498,7 +514,7 @@
</span><span class="cx"> ) ); ?>
</span><span class="cx">
</span><span class="cx"> <a href="<?php echo admin_url( add_query_arg( array( 'post_type' => 'page' ), 'post-new.php' ) ); ?>" class="button-secondary"><?php _e( 'New Page' ); ?></a>
</span><del>-
</del><ins>+ <input class="button-primary" type="submit" value="<?php _e( 'Save', 'buddypress' ) ?>" />
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -541,7 +557,7 @@
</span><span class="cx"> ) ) ?>
</span><span class="cx">
</span><span class="cx"> <a href="<?php echo admin_url( add_query_arg( array( 'post_type' => 'page' ), 'post-new.php' ) ); ?>" class="button-secondary"><?php _e( 'New Page' ); ?></a>
</span><del>-
</del><ins>+ <input class="button-primary" type="submit" value="<?php _e( 'Save', 'buddypress' ) ?>" />
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>