<!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][6026] trunk/bp-core: Remove a bunch of admin screen helper functions which came from bbPress.</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/6026">6026</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-05-13 16:52:16 +0000 (Sun, 13 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove a bunch of admin screen helper functions which came from bbPress. See <a href="http://buddypress.trac.wordpress.org/ticket/4008">#4008</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoresettingsphp">trunk/bp-core/admin/bp-core-settings.php</a></li>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoresettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-settings.php (6025 => 6026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-settings.php 2012-05-13 15:49:00 UTC (rev 6025)
+++ trunk/bp-core/admin/bp-core-settings.php 2012-05-13 16:52:16 UTC (rev 6026)
</span><span class="lines">@@ -265,45 +265,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Contextual help for BuddyPress settings page
- *
- * @since BuddyPress (r3119)
- */
-function bp_core_admin_settings_help() {
-
- $bp_contextual_help[] = __('This screen provides access to basic BuddyPress settings.', 'buddypress' );
- $bp_contextual_help[] = __('In the Main Settings you have a number of options:', 'buddypress' );
- $bp_contextual_help[] =
- '<ul>' .
- '<li>' . __( 'You can choose to lock a post after a certain number of minutes. "Locking post editing" will prevent the author from editing some amount of time after saving a post.', 'buddypress' ) . '</li>' .
- '<li>' . __( '"Throttle time" is the amount of time required between posts from a single author. The higher the throttle time, the longer a user will need to wait between posting to the forum.', 'buddypress' ) . '</li>' .
- '<li>' . __( 'You may choose to allow favorites, which are a way for users to save and later return to topics they favor. This is enabled by default.', 'buddypress' ) . '</li>' .
- '<li>' . __( 'You may choose to allow subscriptions, which allows users to subscribe for notifications to topics that interest them. This is enabled by default.', 'buddypress' ) . '</li>' .
- '<li>' . __( 'You may choose to allow "Anonymous Posting", which will allow guest users who do not have accounts on your site to both create topics as well as replies.', 'buddypress' ) . '</li>' .
- '</ul>';
-
- $bp_contextual_help[] = __( 'Per Page settings allow you to control the number of topics and replies will appear on each of those pages. This is comparable to the WordPress "Reading Settings" page, where you can set the number of posts that should show on blog pages and in feeds.', 'buddypress' );
- $bp_contextual_help[] = __( 'The Forums section allows you to control the permalink structure for your forums. Each "base" is what will be displayed after your main URL and right before your permalink slug.', 'buddypress' );
- $bp_contextual_help[] = __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.', 'buddypress' );
- $bp_contextual_help[] = __( '<strong>For more information:</strong>', 'buddypress' );
- $bp_contextual_help[] =
- '<ul>' .
- '<li>' . __( '<a href="http://buddypress.org/documentation/">BuddyPress Documentation</a>', 'buddypress' ) . '</li>' .
- '<li>' . __( '<a href="http://buddypress.org/forums/">BuddyPress Support Forums</a>', 'buddypress' ) . '</li>' .
- '</ul>' ;
-
- // Empty the default $contextual_help var
- $contextual_help = '';
-
- // Wrap each help item in paragraph tags
- foreach( $bp_contextual_help as $paragraph )
- $contextual_help .= '<p>' . $paragraph . '</p>';
-
- // Add help
- add_contextual_help( 'settings_page_buddypress', $contextual_help );
-}
-
-/**
</del><span class="cx"> * Output settings API option
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (r3203)
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (6025 => 6026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2012-05-13 15:49:00 UTC (rev 6025)
+++ trunk/bp-core/bp-core-admin.php 2012-05-13 16:52:16 UTC (rev 6026)
</span><span class="lines">@@ -48,11 +48,6 @@
</span><span class="cx"> public $images_url = '';
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @var string URL to the BuddyPress admin styles directory
- */
- public $styles_url = '';
-
- /**
</del><span class="cx"> * @var string URL to the BuddyPress admin CSS directory
</span><span class="cx"> */
</span><span class="cx"> public $css_url = '';
</span><span class="lines">@@ -62,20 +57,7 @@
</span><span class="cx"> */
</span><span class="cx"> public $js_url = '';
</span><span class="cx">
</span><del>- /** Recounts **************************************************************/
</del><span class="cx">
</span><del>- /**
- * @var bool Enable recounts in Tools area
- */
- public $enable_recounts = false;
-
- /** Admin Scheme **********************************************************/
-
- /**
- * @var int Depth of custom WP_CONTENT_DIR difference
- */
- public $content_depth = 0;
-
</del><span class="cx"> /** Methods ***************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -116,9 +98,6 @@
</span><span class="cx">
</span><span class="cx"> // Admin css URL
</span><span class="cx"> $this->js_url = trailingslashit( $this->admin_url . 'js' );
</span><del>-
- // Admin images URL
- $this->styles_url = trailingslashit( $this->admin_url . 'styles' );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -177,17 +156,8 @@
</span><span class="cx"> // Enqueue all admin JS and CSS
</span><span class="cx"> add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
</span><span class="cx">
</span><del>- // Forums 'Right now' Dashboard widget
- //add_action( 'wp_dashboard_setup', array( $this, 'dashboard_widget_right_now' ) );
-
</del><span class="cx"> /** BuddyPress Actions ************************************************/
</span><span class="cx">
</span><del>- // Add importers
- //add_action( 'bp_admin_init', array( $this, 'register_importers' ) );
-
- // Add red admin style
- //add_action( 'bp_admin_init', array( $this, 'register_admin_style' ) );
-
</del><span class="cx"> // Add settings
</span><span class="cx"> add_action( 'bp_admin_init', array( $this, 'register_admin_settings' ) );
</span><span class="cx">
</span><span class="lines">@@ -195,9 +165,6 @@
</span><span class="cx">
</span><span class="cx"> // Add link to settings page
</span><span class="cx"> add_filter( 'plugin_action_links', array( $this, 'add_settings_link' ), 10, 2 );
</span><del>-
- // Add sample permalink filter
- //add_filter( 'post_type_link', 'bp_filter_sample_permalink', 10, 4 );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function start_wizard() {
</span><span class="lines">@@ -379,46 +346,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Register the importers
- *
- * @since BuddyPress (1.6)
- *
- * @uses do_action() Calls 'bp_register_importers'
- * @uses apply_filters() Calls 'bp_importer_path' filter to allow plugins
- * to customize the importer script locations.
- */
- public function register_importers() {
-
- // Leave if we're not in the import section
- if ( !defined( 'WP_LOAD_IMPORTERS' ) )
- return;
-
- // Load Importer API
- require_once( ABSPATH . 'wp-admin/includes/import.php' );
-
- // Load our importers
- $importers = apply_filters( 'bp_importers', array( 'buddypress' ) );
-
- // Loop through included importers
- foreach ( $importers as $importer ) {
-
- // Allow custom importer directory
- $import_dir = apply_filters( 'bp_importer_path', $this->admin_dir . 'importers', $importer );
-
- // Compile the importer path
- $import_file = trailingslashit( $import_dir ) . $importer . '.php';
-
- // If the file exists, include it
- if ( file_exists( $import_file ) ) {
- require( $import_file );
- }
- }
-
- // Don't do anything we wouldn't do
- do_action( 'bp_register_importers' );
- }
-
- /**
</del><span class="cx"> * Add Settings link to plugins area
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><span class="lines">@@ -451,17 +378,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Add the 'Right now in Forums' dashboard widget
- *
- * @since BuddyPress (1.6)
- *
- * @uses wp_add_dashboard_widget() To add the dashboard widget
- */
- public function dashboard_widget_right_now() {
- //wp_add_dashboard_widget( 'bp-dashboard-right-now', __( 'Right Now in Forums', 'buddypress' ), 'bp_dashboard_widget_right_now' );
- }
-
- /**
</del><span class="cx"> * Add some general styling to the admin area
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><span class="lines">@@ -505,35 +421,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Registers the BuddyPress admin color scheme
- *
- * Because wp-content can exist outside of the WordPress root there is no
- * way to be certain what the relative path of the admin images is.
- * We are including the two most common configurations here, just in case.
- *
- * @since BuddyPress (1.6)
- *
- * @uses wp_admin_css_color() To register the color scheme
- */
- public function register_admin_style () {
-
- // Normal wp-content dir
- if ( 0 === $this->content_depth )
- $css_file = $this->styles_url . 'admin.css';
-
- // Custom wp-content dir is 1 level away
- elseif ( 1 === $this->content_depth )
- $css_file = $this->styles_url . 'admin-1.css';
-
- // Custom wp-content dir is 1 level away
- elseif ( 2 === $this->content_depth )
- $css_file = $this->styles_url . 'admin-2.css';
-
- // Load the admin CSS styling
- //wp_admin_css_color( 'buddypress', __( 'Green', 'buddypress' ), $css_file, array( '#222222', '#006600', '#deece1', '#6eb469' ) );
- }
-
- /**
</del><span class="cx"> * Add any admin notices we might need, mostly for update or new installs
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span></span></pre>
</div>
</div>
</body>
</html>