<!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][5944] trunk/bp-core/admin/bp-core-slugs.php: Add sanity checks to bp_core_admin_slugs_options() and allow static pages to be filtered.</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/5944">5944</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-03-24 21:10:16 +0000 (Sat, 24 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add sanity checks to bp_core_admin_slugs_options() and allow static pages to be filtered.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreslugsphp">trunk/bp-core/admin/bp-core-slugs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreslugsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-slugs.php (5943 => 5944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-slugs.php 2012-03-23 18:36:08 UTC (rev 5943)
+++ trunk/bp-core/admin/bp-core-slugs.php 2012-03-24 21:10:16 UTC (rev 5944)
</span><span class="lines">@@ -60,121 +60,132 @@
</span><span class="cx"> // directory pages.
</span><span class="cx"> $directory_pages = array();
</span><span class="cx">
</span><del>- foreach( $bp->loaded_components as $component_slug => $component_id ) {
</del><ins>+ // Loop through loaded components and collect directories
+ if ( is_array( $bp->loaded_components ) ) {
+ foreach( $bp->loaded_components as $component_slug => $component_id ) {
</ins><span class="cx">
</span><del>- // Only components that need directories should be listed here
- if ( isset( $bp->{$component_id} ) && !empty( $bp->{$component_id}->has_directory ) ) {
</del><ins>+ // Only components that need directories should be listed here
+ if ( isset( $bp->{$component_id} ) && !empty( $bp->{$component_id}->has_directory ) ) {
</ins><span class="cx">
</span><del>- // component->name was introduced in BP 1.5, so we must provide a fallback
- $component_name = !empty( $bp->{$component_id}->name ) ? $bp->{$component_id}->name : ucwords( $component_id );
-
- $directory_pages[$component_id] = $component_name;
</del><ins>+ // component->name was introduced in BP 1.5, so we must provide a fallback
+ $directory_pages[$component_id] = !empty( $bp->{$component_id}->name ) ? $bp->{$component_id}->name : ucwords( $component_id );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /** Directory Display *****************************************************/
+
</ins><span class="cx"> $directory_pages = apply_filters( 'bp_directory_pages', $directory_pages );
</span><span class="cx">
</span><del>- ?>
</del><ins>+ if ( !empty( $directory_pages ) ) : ?>
</ins><span class="cx">
</span><del>- <h3><?php _e( 'Directories', 'buddypress' ); ?></h3>
</del><ins>+ <h3><?php _e( 'Directories', 'buddypress' ); ?></h3>
</ins><span class="cx">
</span><del>- <p><?php _e( 'Associate a WordPress Page with each BuddyPress component directory.', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'Associate a WordPress Page with each BuddyPress component directory.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><del>- <table class="form-table">
- <tbody>
</del><ins>+ <table class="form-table">
+ <tbody>
</ins><span class="cx">
</span><del>- <?php foreach ( $directory_pages as $name => $label ) : ?>
- <?php $disabled = !bp_is_active( $name ) ? ' disabled="disabled"' : ''; ?>
</del><ins>+ <?php foreach ( $directory_pages as $name => $label ) : ?>
</ins><span class="cx">
</span><del>- <tr valign="top">
- <th scope="row">
- <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
- </th>
</del><ins>+ <tr valign="top">
+ <th scope="row">
+ <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
+ </th>
</ins><span class="cx">
</span><del>- <td>
- <?php if ( !bp_is_root_blog() )
- switch_to_blog( bp_get_root_blog_id() ) ?>
</del><ins>+ <td>
+ <?php if ( !bp_is_root_blog() )
+ switch_to_blog( bp_get_root_blog_id() ) ?>
</ins><span class="cx">
</span><del>- <?php echo wp_dropdown_pages( array(
- 'name' => 'bp_pages[' . esc_attr( $name ) . ']',
- 'echo' => false,
- 'show_option_none' => __( '- None -', 'buddypress' ),
- 'selected' => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
- ) ); ?>
</del><ins>+ <?php echo wp_dropdown_pages( array(
+ 'name' => 'bp_pages[' . esc_attr( $name ) . ']',
+ 'echo' => false,
+ 'show_option_none' => __( '- None -', 'buddypress' ),
+ 'selected' => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
+ ) ); ?>
</ins><span class="cx">
</span><del>- <a href="<?php echo admin_url( add_query_arg( array( 'post_type' => 'page' ), 'post-new.php' ) ); ?>" class="button-secondary"><?php _e( 'New Page' ); ?></a>
- <input class="button-primary" type="submit" name="bp-admin-pages-single" value="<?php _e( 'Save', 'buddypress' ) ?>" />
</del><ins>+ <a href="<?php echo admin_url( add_query_arg( array( 'post_type' => 'page' ), 'post-new.php' ) ); ?>" class="button-secondary"><?php _e( 'New Page' ); ?></a>
+ <input class="button-primary" type="submit" name="bp-admin-pages-single" value="<?php _e( 'Save', 'buddypress' ) ?>" />
</ins><span class="cx">
</span><del>- <?php if ( !empty( $existing_pages[$name] ) ) : ?>
</del><ins>+ <?php if ( !empty( $existing_pages[$name] ) ) : ?>
</ins><span class="cx">
</span><del>- <a href="<?php echo get_permalink( $existing_pages[$name] ); ?>" class="button-secondary" target="_bp"><?php _e( 'View' ); ?></a>
</del><ins>+ <a href="<?php echo get_permalink( $existing_pages[$name] ); ?>" class="button-secondary" target="_bp"><?php _e( 'View' ); ?></a>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php if ( !bp_is_root_blog() )
- restore_current_blog() ?>
</del><ins>+ <?php if ( !bp_is_root_blog() )
+ restore_current_blog() ?>
</ins><span class="cx">
</span><del>- </td>
- </tr>
</del><ins>+ </td>
+ </tr>
</ins><span class="cx">
</span><span class="cx">
</span><del>- <?php endforeach ?>
</del><ins>+ <?php endforeach ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_active_external_directories' ); ?>
</del><ins>+ <?php do_action( 'bp_active_external_directories' ); ?>
</ins><span class="cx">
</span><del>- </tbody>
- </table>
</del><ins>+ </tbody>
+ </table>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span><ins>+ endif;
+
+ /** Static Display ********************************************************/
+
</ins><span class="cx"> // Static pages
</span><span class="cx"> $static_pages = array(
</span><span class="cx"> 'register' => __( 'Register', 'buddypress' ),
</span><span class="cx"> 'activate' => __( 'Activate', 'buddypress' ),
</span><del>- ); ?>
</del><ins>+ );
+
+ $static_pages = apply_filters( 'bp_static_pages', $static_pages );
+
+ if ( !empty( $static_pages ) ) : ?>
</ins><span class="cx">
</span><del>- <h3><?php _e( 'Registration', 'buddypress' ); ?></h3>
</del><ins>+ <h3><?php _e( 'Registration', 'buddypress' ); ?></h3>
</ins><span class="cx">
</span><del>- <p><?php _e( 'Associate WordPress Pages with the following BuddyPress Registration pages.', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'Associate WordPress Pages with the following BuddyPress Registration pages.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><del>- <table class="form-table">
- <tbody>
</del><ins>+ <table class="form-table">
+ <tbody>
</ins><span class="cx">
</span><del>- <?php foreach ( $static_pages as $name => $label ) : ?>
</del><ins>+ <?php foreach ( $static_pages as $name => $label ) : ?>
</ins><span class="cx">
</span><del>- <tr valign="top">
- <th scope="row">
- <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
- </th>
</del><ins>+ <tr valign="top">
+ <th scope="row">
+ <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
+ </th>
</ins><span class="cx">
</span><del>- <td>
- <?php echo wp_dropdown_pages( array(
- 'name' => 'bp_pages[' . esc_attr( $name ) . ']',
- 'echo' => false,
- 'show_option_none' => __( '- None -', 'buddypress' ),
- 'selected' => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
- ) ) ?>
</del><ins>+ <td>
+ <?php echo wp_dropdown_pages( array(
+ 'name' => 'bp_pages[' . esc_attr( $name ) . ']',
+ 'echo' => false,
+ 'show_option_none' => __( '- None -', 'buddypress' ),
+ 'selected' => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
+ ) ) ?>
</ins><span class="cx">
</span><del>- <a href="<?php echo admin_url( add_query_arg( array( 'post_type' => 'page' ), 'post-new.php' ) ); ?>" class="button-secondary"><?php _e( 'New Page' ); ?></a>
- <input class="button-primary" type="submit" name="bp-admin-pages-single" value="<?php _e( 'Save', 'buddypress' ) ?>" />
</del><ins>+ <a href="<?php echo admin_url( add_query_arg( array( 'post_type' => 'page' ), 'post-new.php' ) ); ?>" class="button-secondary"><?php _e( 'New Page' ); ?></a>
+ <input class="button-primary" type="submit" name="bp-admin-pages-single" value="<?php _e( 'Save', 'buddypress' ) ?>" />
</ins><span class="cx">
</span><del>- <?php if ( !empty( $existing_pages[$name] ) ) : ?>
</del><ins>+ <?php if ( !empty( $existing_pages[$name] ) ) : ?>
</ins><span class="cx">
</span><del>- <a href="<?php echo get_permalink( $existing_pages[$name] ); ?>" class="button-secondary" target="_bp"><?php _e( 'View' ); ?></a>
</del><ins>+ <a href="<?php echo get_permalink( $existing_pages[$name] ); ?>" class="button-secondary" target="_bp"><?php _e( 'View' ); ?></a>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- </td>
- </tr>
</del><ins>+ </td>
+ </tr>
</ins><span class="cx">
</span><del>- <?php endforeach ?>
</del><ins>+ <?php endforeach ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_active_external_pages' ); ?>
</del><ins>+ <?php do_action( 'bp_active_external_pages' ); ?>
</ins><span class="cx">
</span><del>- </tbody>
- </table>
</del><ins>+ </tbody>
+ </table>
</ins><span class="cx">
</span><del>- <?php
</del><ins>+ <?php
+ endif;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>