<!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][5717] trunk/bp-core/admin/bp-core-update.php: Fix selected page ID's appearing incorrectly in the update wizard.</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/5717">5717</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-11 06:03:19 +0000 (Sat, 11 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix selected page ID's appearing incorrectly in the update wizard. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3995">#3995</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (5716 => 5717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2012-02-11 06:01:03 UTC (rev 5716)
+++ trunk/bp-core/admin/bp-core-update.php 2012-02-11 06:03:19 UTC (rev 5717)
</span><span class="lines">@@ -368,7 +368,9 @@
</span><span class="cx"> <p><input type="radio" name="bp_pages[blogs]" checked="checked" value="<?php echo $blogs_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo site_url( $blogs_slug ); ?>/</p>
</span><span class="cx">
</span><span class="cx"> <?php if ( $page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&show_option_none=" . __( '- Select -', 'buddypress' ) . $existing_blog_page ) ) : ?>
</span><ins>+
</ins><span class="cx"> <p><input type="radio" name="bp_pages[blogs]" value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?><?php echo $page_dropdown ?></p>
</span><ins>+
</ins><span class="cx"> <?php endif ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -486,8 +488,10 @@
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[members]" <?php checked( empty( $existing_pages['members'] ) ); ?> value="<?php echo $members_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ) ?> <?php echo home_url( $members_slug ); ?>/</label></p>
</span><span class="cx">
</span><del>- <?php if ( $members_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&show_option_none=" . __( '- Select -', 'buddypress' ) . $existing_pages['members'] ) ) : ?>
</del><ins>+ <?php if ( $members_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['members']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
+
</ins><span class="cx"> <p><label><input type="radio" name="bp_pages[members]" <?php checked( !empty( $existing_pages['members'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $members_page_dropdown ?></label></p>
</span><ins>+
</ins><span class="cx"> <?php endif ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -502,7 +506,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[activity]" <?php checked( empty( $existing_pages['activity'] ) ); ?> value="<?php echo $activity_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $activity_slug ); ?>/</label></p>
</span><span class="cx">
</span><del>- <?php if ( $activity_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&show_option_none=" . __( '- Select -', 'buddypress' ) . $existing_pages['activity'] ) ) : ?>
</del><ins>+ <?php if ( $activity_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['activity']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</ins><span class="cx"> <p><label><input type="radio" name="bp_pages[activity]" <?php checked( !empty( $existing_pages['activity'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $activity_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -520,7 +524,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[groups]" <?php checked( empty( $existing_pages['groups'] ) ); ?> value="<?php echo $groups_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $groups_slug ); ?>/</label></p>
</span><span class="cx">
</span><del>- <?php if ( $groups_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&show_option_none=" . __( '- Select -', 'buddypress' ) . $existing_pages['groups'] ) ) : ?>
</del><ins>+ <?php if ( $groups_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['groups']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</ins><span class="cx"> <p><label><input type="radio" name="bp_pages[groups]" <?php checked( !empty( $existing_pages['groups'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $groups_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -538,7 +542,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[forums]" <?php checked( empty( $existing_pages['forums'] ) ); ?> value="<?php echo $forums_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $forums_slug ); ?>/</label></p>
</span><span class="cx">
</span><del>- <?php if ( $forums_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&show_option_none=" . __( '- Select -', 'buddypress' ) . $existing_pages['forums'] ) ) : ?>
</del><ins>+ <?php if ( $forums_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['forums']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</ins><span class="cx"> <p><label><input type="radio" name="bp_pages[forums]" <?php checked( !empty( $existing_pages['forums'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $forums_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -557,7 +561,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[blogs]" <?php checked( empty( $existing_pages['blogs'] ) ); ?> value="<?php echo $blogs_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $blogs_slug ); ?>/</label></p>
</span><span class="cx">
</span><del>- <?php if ( $blogs_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&show_option_none=" . __( '- Select -', 'buddypress' ) . $existing_pages['blogs'] ) ) : ?>
</del><ins>+ <?php if ( $blogs_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['blogs']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</ins><span class="cx"> <p><label><input type="radio" name="bp_pages[blogs]" <?php checked( !empty( $existing_pages['blogs'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $blogs_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -573,7 +577,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[register]" <?php checked( empty( $existing_pages['register'] ) ); ?> value="<?php echo $register_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ) ?> <?php echo home_url( $register_slug ) ?>/</label></p>
</span><span class="cx">
</span><del>- <?php if ( $register_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&show_option_none=" . __( '- Select -', 'buddypress' ) . $existing_pages['register'] ) ) : ?>
</del><ins>+ <?php if ( $register_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['register']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</ins><span class="cx"> <p><label><input type="radio" name="bp_pages[register]" <?php checked( !empty( $existing_pages['register'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $register_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -587,7 +591,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[activate]" <?php checked( empty( $existing_pages['activate'] ) ); ?> value="<?php echo $activation_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $activation_slug ); ?>/</label></p>
</span><span class="cx">
</span><del>- <?php if ( $activate_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&show_option_none=" . __( '- Select -', 'buddypress' ) . $existing_pages['activate'] ) ) : ?>
</del><ins>+ <?php if ( $activate_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['activate']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</ins><span class="cx"> <p><label><input type="radio" name="bp_pages[activate]" <?php checked( !empty( $existing_pages['activate'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $activate_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -613,11 +617,10 @@
</span><span class="cx">
</span><span class="cx"> $prefix = '';
</span><span class="cx"> $permalink_structure = get_option( 'permalink_structure' );
</span><del>- $using_permalinks = ( !empty( $permalink_structure ) ) ? true : false;
</del><span class="cx"> $structures = array( '', $prefix . '/%year%/%monthnum%/%day%/%postname%/', $prefix . '/%year%/%monthnum%/%postname%/', $prefix . '/archives/%post_id%' );
</span><span class="cx">
</span><span class="cx"> // If we're using permalinks already, adjust text accordingly
</span><del>- if ( $permalink_structure )
</del><ins>+ if ( !empty( $permalink_structure ) )
</ins><span class="cx"> $permalink_setup_text = __( 'Congratulations! You are already using pretty permalinks, which BuddyPress requires. If you\'d like to change your settings, you may do so now. If you\'re happy with your current settings, click Save &amp; Next to continue.', 'buddypress' );
</span><span class="cx"> else
</span><span class="cx"> $permalink_setup_text = __( 'To make sure the pages created in the previous step work correctly, pretty permalinks must be active on your site.', 'buddypress' );
</span><span class="lines">@@ -666,9 +669,9 @@
</span><span class="cx">
</span><span class="cx"> $installed_plugins = get_plugins();
</span><span class="cx"> $installed_themes = get_themes();
</span><ins>+ $bp_themes = array();
</ins><span class="cx">
</span><span class="cx"> $template_pack_installed = false;
</span><del>- $bp_autotheme_installed = false;
</del><span class="cx"> $bp_theme_installed = false;
</span><span class="cx">
</span><span class="cx"> foreach ( (array)$installed_plugins as $plugin ) {
</span><span class="lines">@@ -691,9 +694,9 @@
</span><span class="cx"> $screenshot = '';
</span><span class="cx"> $themes = get_themes();
</span><span class="cx">
</span><del>- if ( !empty( $themes[$current_theme]['Screenshot'] ) )
</del><ins>+ if ( !empty( $themes[$current_theme]['Screenshot'] ) ) {
</ins><span class="cx"> $screenshot = trailingslashit( get_stylesheet_directory_uri() ) . $themes[$current_theme]['Screenshot'];
</span><del>- ?>
</del><ins>+ } ?>
</ins><span class="cx">
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> jQuery( document ).ready( function() {
</span><span class="lines">@@ -917,14 +920,17 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> function step_components_save() {
</span><ins>+
</ins><span class="cx"> if ( isset( $_POST['submit'] ) && isset( $_POST['bp_components'] ) ) {
</span><ins>+
</ins><span class="cx"> check_admin_referer( 'bpwizard_components' );
</span><span class="cx">
</span><span class="cx"> $active_components = array();
</span><span class="cx">
</span><span class="cx"> // Settings form submitted, now save the settings.
</span><del>- foreach ( (array)$_POST['bp_components'] as $key => $value )
</del><ins>+ foreach ( (array) $_POST['bp_components'] as $key => $value ) {
</ins><span class="cx"> $active_components[$key] = 1;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> bp_update_option( 'bp-active-components', $active_components );
</span><span class="cx">
</span><span class="lines">@@ -950,8 +956,9 @@
</span><span class="cx"> // Delete any existing pages
</span><span class="cx"> $existing_pages = bp_core_update_get_page_meta( 'bp-pages' );
</span><span class="cx">
</span><del>- foreach ( (array)$existing_pages as $page_id )
</del><ins>+ foreach ( (array) $existing_pages as $page_id ) {
</ins><span class="cx"> wp_delete_post( $page_id, true );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $blog_pages = $this->setup_pages( (array)$_POST['bp_pages'] );
</span><span class="cx"> bp_update_option( 'bp-pages', $blog_pages );
</span><span class="lines">@@ -1363,7 +1370,6 @@
</span><span class="cx"> } else {
</span><span class="cx"> wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', plugins_url( '/buddypress' ) . '/bp-core/css/admin.css' ), array(), '20110723' );
</span><span class="cx"> wp_enqueue_script( 'bp-update-js', apply_filters( 'bp_core_update_js', plugins_url( '/buddypress' ) . '/bp-core/js/update.js' ), array( 'jquery' ), '20110723' );
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'thickbox' );
</span></span></pre>
</div>
</div>
</body>
</html>