<!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][3949] trunk/bp-xprofile: Split cache out of functions, and adminbar out of admin, in the xprofile 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>3949</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-27 15:12:43 +0000 (Thu, 27 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split cache out of functions, and adminbar out of admin, in the xprofile component</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilefunctionsphp">trunk/bp-xprofile/bp-xprofile-functions.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileloaderphp">trunk/bp-xprofile/bp-xprofile-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofilebuddybarphp">trunk/bp-xprofile/bp-xprofile-buddybar.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilecachephp">trunk/bp-xprofile/bp-xprofile-cache.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (3948 => 3949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2011-01-27 07:30:22 UTC (rev 3948)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2011-01-27 15:12:43 UTC (rev 3949)
</span><span class="lines">@@ -1,82 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Creates the administration interface menus and checks to see if the DB
- * tables are set up.
- *
- * @package BuddyPress XProfile
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @global $wpdb WordPress DB access object.
- * @uses is_super_admin() returns true if the current user is a site admin, false if not
- * @uses bp_xprofile_install() runs the installation of DB tables for the xprofile component
- * @uses wp_enqueue_script() Adds a JS file to the JS queue ready for output
- * @uses add_submenu_page() Adds a submenu tab to a top level tab in the admin area
- * @uses xprofile_install() Runs the DB table installation function
- * @return
- */
-function xprofile_add_admin_menu() {
- global $wpdb, $bp;
-
- if ( !is_super_admin() )
- return false;
-
- // Add the administration tab under the "Site Admin" tab for site administrators
- add_submenu_page( 'bp-general-settings', __( 'Profile Field Setup', 'buddypress' ), __( 'Profile Field Setup', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
-}
-add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_menu' );
-
-/**
- * Adds an admin bar menu to any profile page providing site admin options
- * for that user.
- *
- * @package BuddyPress XProfile
- * @global $bp BuddyPress
- */
-function xprofile_setup_adminbar_menu() {
- global $bp;
-
- if ( !$bp->displayed_user->id )
- return false;
-
- // Don't show this menu to non site admins or if you're viewing your own profile
- if ( !is_super_admin() || bp_is_my_profile() )
- return false; ?>
-
- <li id="bp-adminbar-adminoptions-menu">
- <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
-
- <ul>
- <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug; ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
- <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug; ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
-
- <?php if ( bp_is_active( 'settings' ) ) : ?>
-
- <li><a href="<?php echo $bp->displayed_user->domain . $bp->settings->slug; ?>/general/"><?php printf( __( "Edit %s's Settings", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
-
- <?php endif; ?>
-
- <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
-
- <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
-
- <?php else : ?>
-
- <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
-
- <?php endif; ?>
-
- <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
-
- <?php do_action( 'xprofile_adminbar_menu_items' ) ?>
-
- </ul>
- </li>
-
- <?php
-}
-add_action( 'bp_adminbar_menus', 'xprofile_setup_adminbar_menu', 20 );
-
-/**
</del><span class="cx"> * Handles all actions for the admin area for creating, editing and deleting
</span><span class="cx"> * profile groups and fields.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilebuddybarphp"></a>
<div class="addfile"><h4>Added: trunk/bp-xprofile/bp-xprofile-buddybar.php (0 => 3949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-buddybar.php (rev 0)
+++ trunk/bp-xprofile/bp-xprofile-buddybar.php 2011-01-27 15:12:43 UTC (rev 3949)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<?php
+
+/**
+ * Creates the administration interface menus and checks to see if the DB
+ * tables are set up.
+ *
+ * @package BuddyPress XProfile
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ * @global $wpdb WordPress DB access object.
+ * @uses is_super_admin() returns true if the current user is a site admin, false if not
+ * @uses bp_xprofile_install() runs the installation of DB tables for the xprofile component
+ * @uses wp_enqueue_script() Adds a JS file to the JS queue ready for output
+ * @uses add_submenu_page() Adds a submenu tab to a top level tab in the admin area
+ * @uses xprofile_install() Runs the DB table installation function
+ * @return
+ */
+function xprofile_add_admin_menu() {
+ global $wpdb, $bp;
+
+ if ( !is_super_admin() )
+ return false;
+
+ // Add the administration tab under the "Site Admin" tab for site administrators
+ add_submenu_page( 'bp-general-settings', __( 'Profile Field Setup', 'buddypress' ), __( 'Profile Field Setup', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
+}
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_menu' );
+
+/**
+ * Adds an admin bar menu to any profile page providing site admin options
+ * for that user.
+ *
+ * @package BuddyPress XProfile
+ * @global $bp BuddyPress
+ */
+function xprofile_setup_adminbar_menu() {
+ global $bp;
+
+ if ( !$bp->displayed_user->id )
+ return false;
+
+ // Don't show this menu to non site admins or if you're viewing your own profile
+ if ( !is_super_admin() || bp_is_my_profile() )
+ return false; ?>
+
+ <li id="bp-adminbar-adminoptions-menu">
+ <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
+
+ <ul>
+ <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug; ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+ <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug; ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+
+ <?php if ( bp_is_active( 'settings' ) ) : ?>
+
+ <li><a href="<?php echo $bp->displayed_user->domain . $bp->settings->slug; ?>/general/"><?php printf( __( "Edit %s's Settings", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+
+ <?php endif; ?>
+
+ <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
+
+ <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
+
+ <?php else : ?>
+
+ <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
+
+ <?php endif; ?>
+
+ <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+
+ <?php do_action( 'xprofile_adminbar_menu_items' ) ?>
+
+ </ul>
+ </li>
+
+ <?php
+}
+add_action( 'bp_adminbar_menus', 'xprofile_setup_adminbar_menu', 20 );
+
+?>
</ins><span class="cx">Property changes on: trunk/bp-xprofile/bp-xprofile-buddybar.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkbpxprofilebpxprofilecachephp"></a>
<div class="addfile"><h4>Added: trunk/bp-xprofile/bp-xprofile-cache.php (0 => 3949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-cache.php (rev 0)
+++ trunk/bp-xprofile/bp-xprofile-cache.php 2011-01-27 15:12:43 UTC (rev 3949)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<?php
+
+/********************************************************************************
+ * Caching
+ *
+ * Caching functions handle the clearing of cached objects and pages on specific
+ * actions throughout BuddyPress.
+ */
+
+function xprofile_clear_profile_groups_object_cache( $group_obj ) {
+ wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
+ wp_cache_delete( 'xprofile_group_' . $group_obj->id );
+}
+
+function xprofile_clear_profile_data_object_cache( $group_id ) {
+ global $bp;
+ wp_cache_delete( 'bp_user_fullname_' . $bp->loggedin_user->id, 'bp' );
+}
+
+// List actions to clear object caches on
+add_action( 'xprofile_groups_deleted_group', 'xprofile_clear_profile_groups_object_cache' );
+add_action( 'xprofile_groups_saved_group', 'xprofile_clear_profile_groups_object_cache' );
+add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache' );
+
+// List actions to clear super cached pages on, if super cache is installed
+add_action( 'xprofile_updated_profile', 'bp_core_clear_cache' );
+
+?>
</ins><span class="cx">Property changes on: trunk/bp-xprofile/bp-xprofile-cache.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-functions.php (3948 => 3949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-functions.php 2011-01-27 07:30:22 UTC (rev 3948)
+++ trunk/bp-xprofile/bp-xprofile-functions.php 2011-01-27 15:12:43 UTC (rev 3949)
</span><span class="lines">@@ -684,29 +684,4 @@
</span><span class="cx"> return bp_xprofile_update_meta( $field_data_id, 'data', $meta_key, $meta_value );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/********************************************************************************
- * Caching
- *
- * Caching functions handle the clearing of cached objects and pages on specific
- * actions throughout BuddyPress.
- */
-
-function xprofile_clear_profile_groups_object_cache( $group_obj ) {
- wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
- wp_cache_delete( 'xprofile_group_' . $group_obj->id );
-}
-
-function xprofile_clear_profile_data_object_cache( $group_id ) {
- global $bp;
- wp_cache_delete( 'bp_user_fullname_' . $bp->loggedin_user->id, 'bp' );
-}
-
-// List actions to clear object caches on
-add_action( 'xprofile_groups_deleted_group', 'xprofile_clear_profile_groups_object_cache' );
-add_action( 'xprofile_groups_saved_group', 'xprofile_clear_profile_groups_object_cache' );
-add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache' );
-
-// List actions to clear super cached pages on, if super cache is installed
-add_action( 'xprofile_updated_profile', 'bp_core_clear_cache' );
-
</del><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (3948 => 3949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2011-01-27 07:30:22 UTC (rev 3948)
+++ trunk/bp-xprofile/bp-xprofile-loader.php 2011-01-27 15:12:43 UTC (rev 3949)
</span><span class="lines">@@ -31,12 +31,14 @@
</span><span class="cx"> function _includes() {
</span><span class="cx"> $includes = array(
</span><span class="cx"> 'cssjs',
</span><ins>+ 'cache',
</ins><span class="cx"> 'actions',
</span><span class="cx"> 'screens',
</span><span class="cx"> 'classes',
</span><span class="cx"> 'filters',
</span><span class="cx"> 'template',
</span><del>- 'functions'
</del><ins>+ 'buddybar',
+ 'functions',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_admin() )
</span></span></pre>
</div>
</div>
</body>
</html>