<!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][5751] trunk: First pass at replacing manual script versions with bp_get_version().</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/5751">5751</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-13 04:35:21 +0000 (Mon, 13 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at replacing manual script versions with bp_get_version(). See <a href="http://buddypress.trac.wordpress.org/ticket/3992">#3992</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpcorebpcorewidgetsphp">trunk/bp-core/bp-core-widgets.php</a></li>
<li><a href="#trunkbpgroupsbpgroupswidgetsphp">trunk/bp-groups/bp-groups-widgets.php</a></li>
<li><a href="#trunkbpmembersbpmembersactionsphp">trunk/bp-members/bp-members-actions.php</a></li>
<li><a href="#trunkbpmessagesbpmessagescssjsphp">trunk/bp-messages/bp-messages-cssjs.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilecssjsphp">trunk/bp-xprofile/bp-xprofile-cssjs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-activity/bp-activity-admin.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -244,11 +244,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Enqueue CSS and JavaScript
</span><del>- wp_enqueue_script( 'bp_activity_admin_js', BP_PLUGIN_URL . "bp-activity/admin/js/admin.{$dev}js", array( 'jquery', 'wp-ajax-response' ), '20111211', true );
- wp_enqueue_style( 'bp_activity_admin_css', BP_PLUGIN_URL . "bp-activity/admin/css/admin.{$dev}css", array(), '20111211' );
</del><ins>+ wp_enqueue_script( 'bp_activity_admin_js', BP_PLUGIN_URL . "bp-activity/admin/js/admin.{$dev}js", array( 'jquery', 'wp-ajax-response' ), bp_get_version(), true );
+ wp_enqueue_style( 'bp_activity_admin_css', BP_PLUGIN_URL . "bp-activity/admin/css/admin.{$dev}css", array(), bp_get_version() );
</ins><span class="cx">
</span><span class="cx"> // Handle spam/un-spam/delete of activities
</span><del>- if ( $doaction && ! in_array( $doaction, array( '-1', 'edit', 'save', ) ) ) {
</del><ins>+ if ( !empty( $doaction ) && ! in_array( $doaction, array( '-1', 'edit', 'save', ) ) ) {
</ins><span class="cx">
</span><span class="cx"> // Build redirection URL
</span><span class="cx"> $redirect_to = remove_query_arg( array( 'aid', 'deleted', 'error', 'spammed', 'unspammed', ), wp_get_referer() );
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-core/bp-core-adminbar.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -50,8 +50,6 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_load_admin_bar_css() {
</span><span class="cx">
</span><del>- $version = '2011116';
-
</del><span class="cx"> if ( !bp_use_wp_admin_bar() || defined( 'DOING_AJAX' ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -61,7 +59,7 @@
</span><span class="cx"> else
</span><span class="cx"> $stylesheet = BP_PLUGIN_URL . 'bp-core/css/admin-bar.css';
</span><span class="cx">
</span><del>- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array( 'admin-bar' ), $version );
</del><ins>+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array( 'admin-bar' ), bp_get_version() );
</ins><span class="cx">
</span><span class="cx"> if ( !is_rtl() )
</span><span class="cx"> return;
</span><span class="lines">@@ -71,7 +69,7 @@
</span><span class="cx"> else
</span><span class="cx"> $stylesheet = BP_PLUGIN_URL . 'bp-core/css/admin-bar-rtl.css';
</span><span class="cx">
</span><del>- wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_admin_bar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), $version );
</del><ins>+ wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_admin_bar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), bp_get_version() );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', 'bp_core_load_admin_bar_css' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-core/bp-core-buddybar.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> else
</span><span class="cx"> $stylesheet = BP_PLUGIN_URL . 'bp-core/css/buddybar.css';
</span><span class="cx">
</span><del>- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array(), '20110723' );
</del><ins>+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array(), bp_get_version() );
</ins><span class="cx">
</span><span class="cx"> if ( !is_rtl() )
</span><span class="cx"> return;
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx"> else
</span><span class="cx"> $stylesheet = BP_PLUGIN_URL . 'bp-core/css/buddybar-rtl.css';
</span><span class="cx">
</span><del>- wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), '20110723' );
</del><ins>+ wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), bp_get_version() );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', 'bp_core_load_buddybar_css' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcorewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-widgets.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-widgets.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-core/bp-core-widgets.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -23,10 +23,11 @@
</span><span class="cx"> parent::__construct( false, $name = __( 'Members', 'buddypress' ), $widget_ops );
</span><span class="cx">
</span><span class="cx"> if ( is_active_widget( false, false, $this->id_base ) && !is_admin() && !is_network_admin() ) {
</span><del>- if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
- wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . 'bp-core/js/widget-members.dev.js', array( 'jquery' ), '20110723' );
- else
- wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . 'bp-core/js/widget-members.js', array( 'jquery' ), '20110723' );
</del><ins>+ if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+ wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . 'bp-core/js/widget-members.dev.js', array( 'jquery' ), bp_get_version() );
+ } else {
+ wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . 'bp-core/js/widget-members.js', array( 'jquery' ), bp_get_version() );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-widgets.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-widgets.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-groups/bp-groups-widgets.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -28,10 +28,11 @@
</span><span class="cx"> parent::__construct( false, __( 'Groups', 'buddypress' ), $widget_ops );
</span><span class="cx">
</span><span class="cx"> if ( is_active_widget( false, false, $this->id_base ) && !is_admin() && !is_network_admin() ) {
</span><del>- if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
- wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . 'bp-groups/js/widget-groups.dev.js', array( 'jquery' ) );
- else
- wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . 'bp-groups/js/widget-groups.js', array( 'jquery' ) );
</del><ins>+ if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+ wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . 'bp-groups/js/widget-groups.dev.js', array( 'jquery' ), bp_get_version() );
+ } else {
+ wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . 'bp-groups/js/widget-groups.js', array( 'jquery' ), bp_get_version() );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmembersbpmembersactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-actions.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-actions.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-members/bp-members-actions.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -15,15 +15,6 @@
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Listens to the $bp component and action variables to determine if the user is viewing the members
- * directory page. If they are, it will set up the directory and load the members directory template.
- *
- * @package BuddyPress Core
- * @global object $bp Global BuddyPress settings object
- * @uses wp_enqueue_script() Loads a JS script into the header of the page.
- * @uses bp_core_load_template() Loads a specific template file.
- */
-/**
</del><span class="cx"> * When a site admin selects "Mark as Spammer/Not Spammer" from the admin menu
</span><span class="cx"> * this action will fire and mark or unmark the user and their blogs as spam.
</span><span class="cx"> * Must be a site admin for this function to run.
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagescssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-cssjs.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-cssjs.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-messages/bp-messages-cssjs.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -19,16 +19,16 @@
</span><span class="cx"> add_action( 'wp_head', 'messages_autocomplete_init_jsblock' );
</span><span class="cx">
</span><span class="cx"> if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
</span><del>- wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocomplete.dev.js', array( 'jquery' ), '20110723' );
- wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocompletefb.dev.js', array(), '20110723' );
- wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.bgiframe.dev.js', array(), '20110723' );
- wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.dimensions.dev.js', array(), '20110723' );
</del><ins>+ wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocomplete.dev.js', array( 'jquery' ), bp_get_version() );
+ wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocompletefb.dev.js', array(), bp_get_version() );
+ wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.bgiframe.dev.js', array(), bp_get_version() );
+ wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.dimensions.dev.js', array(), bp_get_version() );
</ins><span class="cx">
</span><span class="cx"> } else {
</span><del>- wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocomplete.js', array( 'jquery' ), '20110723' );
- wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocompletefb.js', array(), '20110723' );
- wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.bgiframe.js', array(), '20110723' );
- wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.dimensions.js', array(), '20110723' );
</del><ins>+ wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocomplete.js', array( 'jquery' ), bp_get_version() );
+ wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocompletefb.js', array(), bp_get_version() );
+ wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.bgiframe.js', array(), bp_get_version() );
+ wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.dimensions.js', array(), bp_get_version() );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx">
</span><span class="cx"> if ( bp_is_messages_component() && bp_is_current_action( 'compose' ) ) {
</span><span class="cx"> if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
</span><del>- wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . 'bp-messages/css/autocomplete/jquery.autocompletefb.dev.css', array(), '20110723' );
</del><ins>+ wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . 'bp-messages/css/autocomplete/jquery.autocompletefb.dev.css', array(), bp_get_version() );
</ins><span class="cx"> } else {
</span><del>- wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . 'bp-messages/css/autocomplete/jquery.autocompletefb.css', array(), '20110723' );
</del><ins>+ wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . 'bp-messages/css/autocomplete/jquery.autocompletefb.css', array(), bp_get_version() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_print_styles();
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-themes/bp-default/functions.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -141,11 +141,8 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_enqueue_scripts() {
</span><span class="cx">
</span><del>- // Bump this when changes are made to bust cache
- $version = '20111023';
-
</del><span class="cx"> // Enqueue the global JS - Ajax will not work without it
</span><del>- wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ), $version );
</del><ins>+ wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ), bp_get_version() );
</ins><span class="cx">
</span><span class="cx"> // Add words that we need to use in JS to the end of the page so they can be translated and still used.
</span><span class="cx"> $params = array(
</span><span class="lines">@@ -187,15 +184,12 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_enqueue_styles() {
</span><span class="cx">
</span><del>- // Bump this when changes are made to bust cache
- $version = '20111211';
-
</del><span class="cx"> // Register our main stylesheet
</span><del>- wp_register_style( 'bp-default-main', get_template_directory_uri() . '/_inc/css/default.css', array(), $version );
</del><ins>+ wp_register_style( 'bp-default-main', get_template_directory_uri() . '/_inc/css/default.css', array(), bp_get_version() );
</ins><span class="cx">
</span><span class="cx"> // If the current theme is a child of bp-default, enqueue its stylesheet
</span><span class="cx"> if ( is_child_theme() && 'bp-default' == get_template() ) {
</span><del>- wp_enqueue_style( get_stylesheet(), get_stylesheet_uri(), array( 'bp-default-main' ), $version );
</del><ins>+ wp_enqueue_style( get_stylesheet(), get_stylesheet_uri(), array( 'bp-default-main' ), bp_get_version() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Enqueue the main stylesheet
</span><span class="lines">@@ -203,14 +197,14 @@
</span><span class="cx">
</span><span class="cx"> // Default CSS RTL
</span><span class="cx"> if ( is_rtl() )
</span><del>- wp_enqueue_style( 'bp-default-main-rtl', get_template_directory_uri() . '/_inc/css/default-rtl.css', array( 'bp-default-main' ), $version );
</del><ins>+ wp_enqueue_style( 'bp-default-main-rtl', get_template_directory_uri() . '/_inc/css/default-rtl.css', array( 'bp-default-main' ), bp_get_version() );
</ins><span class="cx">
</span><span class="cx"> // Responsive layout
</span><span class="cx"> if ( current_theme_supports( 'bp-default-responsive' ) ) {
</span><del>- wp_enqueue_style( 'bp-default-responsive', get_template_directory_uri() . '/_inc/css/responsive.css', array( 'bp-default-main' ), $version );
</del><ins>+ wp_enqueue_style( 'bp-default-responsive', get_template_directory_uri() . '/_inc/css/responsive.css', array( 'bp-default-main' ), bp_get_version() );
</ins><span class="cx">
</span><span class="cx"> if ( is_rtl() ) {
</span><del>- wp_enqueue_style( 'bp-default-responsive-rtl', get_template_directory_uri() . '/_inc/css/responsive-rtl.css', array( 'bp-default-responsive' ), $version );
</del><ins>+ wp_enqueue_style( 'bp-default-responsive-rtl', get_template_directory_uri() . '/_inc/css/responsive-rtl.css', array( 'bp-default-responsive' ), bp_get_version() );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -16,10 +16,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress XProfile
</span><span class="cx"> * @uses bp_current_user_can() returns true if the current user is a site admin, false if not
</span><del>- * @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
</del><ins>+ * @uses add_users_page() Adds a submenu tab to a top level tab in the admin area
</ins><span class="cx"> * @return
</span><span class="cx"> */
</span><span class="cx"> function xprofile_add_admin_menu() {
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-cssjs.php (5750 => 5751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-cssjs.php 2012-02-13 04:12:00 UTC (rev 5750)
+++ trunk/bp-xprofile/bp-xprofile-cssjs.php 2012-02-13 04:35:21 UTC (rev 5751)
</span><span class="lines">@@ -16,13 +16,11 @@
</span><span class="cx"> * @since BuddyPress (1.1)
</span><span class="cx"> */
</span><span class="cx"> function xprofile_add_admin_css() {
</span><del>- $version = '20111224';
-
</del><span class="cx"> if ( !empty( $_GET['page'] ) && strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
</span><span class="cx"> if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
</span><del>- wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . 'bp-xprofile/admin/css/admin.dev.css', array(), $version );
</del><ins>+ wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . 'bp-xprofile/admin/css/admin.dev.css', array(), bp_get_version() );
</ins><span class="cx"> } else {
</span><del>- wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . 'bp-xprofile/admin/css/admin.css', array(), $version );
</del><ins>+ wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . 'bp-xprofile/admin/css/admin.css', array(), bp_get_version() );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -42,12 +40,10 @@
</span><span class="cx"> wp_enqueue_script( 'jquery-ui-droppable' );
</span><span class="cx"> wp_enqueue_script( 'jquery-ui-sortable' );
</span><span class="cx">
</span><del>- $version = '20111224';
-
</del><span class="cx"> if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
</span><del>- wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . 'bp-xprofile/admin/js/admin.dev.js', array( 'jquery', 'jquery-ui-sortable' ), $version );
</del><ins>+ wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . 'bp-xprofile/admin/js/admin.dev.js', array( 'jquery', 'jquery-ui-sortable' ), bp_get_version() );
</ins><span class="cx"> } else {
</span><del>- wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . 'bp-xprofile/admin/js/admin.js', array( 'jquery', 'jquery-ui-sortable' ), $version );
</del><ins>+ wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . 'bp-xprofile/admin/js/admin.js', array( 'jquery', 'jquery-ui-sortable' ), bp_get_version() );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>