<!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][5690] trunk/bp-settings: Remove unneeded globals and clean up some code in Settings component.</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/5690">5690</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-10 01:35:34 +0000 (Fri, 10 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unneeded globals and clean up some code in Settings component. See <a href="http://buddypress.trac.wordpress.org/ticket/3989">#3989</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpsettingsbpsettingsactionsphp">trunk/bp-settings/bp-settings-actions.php</a></li>
<li><a href="#trunkbpsettingsbpsettingsfunctionsphp">trunk/bp-settings/bp-settings-functions.php</a></li>
<li><a href="#trunkbpsettingsbpsettingsloaderphp">trunk/bp-settings/bp-settings-loader.php</a></li>
<li><a href="#trunkbpsettingsbpsettingsscreensphp">trunk/bp-settings/bp-settings-screens.php</a></li>
<li><a href="#trunkbpsettingsbpsettingstemplatephp">trunk/bp-settings/bp-settings-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpsettingsbpsettingsactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-actions.php (5689 => 5690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-actions.php 2012-02-10 01:17:51 UTC (rev 5689)
+++ trunk/bp-settings/bp-settings-actions.php 2012-02-10 01:35:34 UTC (rev 5690)
</span><span class="lines">@@ -1,4 +1,13 @@
</span><span class="cx"> <?php
</span><ins>+
+/**
+ * BuddyPress Settings Actions
+ *
+ * @todo split actions into separate screen functions
+ * @package BuddyPress
+ * @subpackage SettingsActions
+ */
+
</ins><span class="cx"> // Exit if accessed directly
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><span class="cx">
</span><span class="lines">@@ -123,7 +132,6 @@
</span><span class="cx"> /** Notifications *************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_core_screen_notification_settings() {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> if ( bp_action_variables() ) {
</span><span class="cx"> bp_do_404();
</span><span class="lines">@@ -153,7 +161,6 @@
</span><span class="cx"> /** Delete Account ************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_core_screen_delete_account() {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> if ( bp_action_variables() ) {
</span><span class="cx"> bp_do_404();
</span><span class="lines">@@ -174,4 +181,4 @@
</span><span class="cx"> bp_core_load_template( apply_filters( 'bp_core_screen_delete_account', 'members/single/settings/delete-account' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkbpsettingsbpsettingsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-functions.php (5689 => 5690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-functions.php 2012-02-10 01:17:51 UTC (rev 5689)
+++ trunk/bp-settings/bp-settings-functions.php 2012-02-10 01:35:34 UTC (rev 5690)
</span><span class="lines">@@ -1,4 +1,13 @@
</span><span class="cx"> <?php
</span><ins>+
+/**
+ * BuddyPress Settings Functions
+ *
+ * @package BuddyPress
+ * @subpackage SettingsFunctions
+ */
+
</ins><span class="cx"> // Exit if accessed directly
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><ins>+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-loader.php (5689 => 5690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-loader.php 2012-02-10 01:17:51 UTC (rev 5689)
+++ trunk/bp-settings/bp-settings-loader.php 2012-02-10 01:35:34 UTC (rev 5690)
</span><span class="lines">@@ -1,4 +1,12 @@
</span><span class="cx"> <?php
</span><ins>+
+/**
+ * BuddyPress Settings Loader
+ *
+ * @package BuddyPress
+ * @subpackage SettingsLoader
+ */
+
</ins><span class="cx"> // Exit if accessed directly
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><span class="cx">
</span><span class="lines">@@ -44,7 +52,6 @@
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span><span class="cx"> function setup_globals() {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> // Define a slug, if necessary
</span><span class="cx"> if ( !defined( 'BP_SETTINGS_SLUG' ) )
</span><span class="lines">@@ -67,6 +74,9 @@
</span><span class="cx"> function setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Define local variable
+ $sub_nav = array();
+
</ins><span class="cx"> // Add the settings navigation item
</span><span class="cx"> $main_nav = array(
</span><span class="cx"> 'name' => __( 'Settings', 'buddypress' ),
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-screens.php (5689 => 5690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-screens.php 2012-02-10 01:17:51 UTC (rev 5689)
+++ trunk/bp-settings/bp-settings-screens.php 2012-02-10 01:35:34 UTC (rev 5690)
</span><span class="lines">@@ -1,4 +1,13 @@
</span><span class="cx"> <?php
</span><ins>+
+/**
+ * BuddyPress Settings Screens
+ *
+ * @package BuddyPress
+ * @subpackage SettingsFunctions
+ */
+
</ins><span class="cx"> // Exit if accessed directly
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><ins>+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-template.php (5689 => 5690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-template.php 2012-02-10 01:17:51 UTC (rev 5689)
+++ trunk/bp-settings/bp-settings-template.php 2012-02-10 01:35:34 UTC (rev 5690)
</span><span class="lines">@@ -1,9 +1,10 @@
</span><span class="cx"> <?php
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * BuddyPress Settings Template Functions
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Settings Template
</del><ins>+ * @subpackage SettingsTemplate
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // Exit if accessed directly
</span><span class="lines">@@ -13,7 +14,7 @@
</span><span class="cx"> * Output the settings component slug
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Settings Template
</del><ins>+ * @subpackage SettingsTemplate
</ins><span class="cx"> * @since 1.5
</span><span class="cx"> *
</span><span class="cx"> * @uses bp_get_settings_slug()
</span><span class="lines">@@ -25,7 +26,7 @@
</span><span class="cx"> * Return the settings component slug
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Settings Template
</del><ins>+ * @subpackage SettingsTemplate
</ins><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_get_settings_slug() {
</span><span class="lines">@@ -37,7 +38,7 @@
</span><span class="cx"> * Output the settings component root slug
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Settings Template
</del><ins>+ * @subpackage SettingsTemplate
</ins><span class="cx"> * @since 1.5
</span><span class="cx"> *
</span><span class="cx"> * @uses bp_get_settings_root_slug()
</span><span class="lines">@@ -49,7 +50,7 @@
</span><span class="cx"> * Return the settings component root slug
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @subpackage Settings Template
</del><ins>+ * @subpackage SettingsTemplate
</ins><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_get_settings_root_slug() {
</span></span></pre>
</div>
</div>
</body>
</html>