<!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][5978] trunk: Adds support for WP 3.4 theme functions.</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/5978">5978</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-04-13 12:59:21 +0000 (Fri, 13 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds support for WP 3.4 theme functions. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4098">#4098</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcorefunctionsphp">trunk/bp-core/admin/bp-core-functions.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorebpcorewpabstractionphp">trunk/bp-core/bp-core-wpabstraction.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-functions.php (5977 => 5978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-functions.php 2012-04-13 12:59:13 UTC (rev 5977)
+++ trunk/bp-core/admin/bp-core-functions.php 2012-04-13 12:59:21 UTC (rev 5978)
</span><span class="lines">@@ -239,7 +239,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // Get current theme info
</span><del>- $ct = current_theme_info();
</del><ins>+ // Backward-compatibility with WP < 3.4 will be removed in a future release
+ if ( bp_get_major_wp_version() >= 3.4 ) {
+ $ct = wp_get_theme();
+ } else {
+ $ct = current_theme_info();
+ }
</ins><span class="cx">
</span><span class="cx"> // The best way to remove this notice is to add a "buddypress" tag to
</span><span class="cx"> // your active theme's CSS header.
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (5977 => 5978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2012-04-13 12:59:13 UTC (rev 5977)
+++ trunk/bp-core/admin/bp-core-update.php 2012-04-13 12:59:21 UTC (rev 5978)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> // Build the steps needed for update or new installations
</span><span class="cx"> $this->steps = $this->add_steps();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function current_step() {
</span><span class="cx"> if ( isset( $_POST['step'] ) ) {
</span><span class="cx"> $current_step = (int) $_POST['step'] + 1;
</span><span class="lines">@@ -134,8 +134,8 @@
</span><span class="cx"> wp_die( 'You do not have sufficient permissions to access this page.' );
</span><span class="cx">
</span><span class="cx"> // Update or Setup
</span><del>- $type = ( 'update' == bp_get_maintenance_mode() ) ? __( 'Update', 'buddypress' ) : __( 'Setup', 'buddypress' );
-
</del><ins>+ $type = ( 'update' == bp_get_maintenance_mode() ) ? __( 'Update', 'buddypress' ) : __( 'Setup', 'buddypress' );
+
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap" id="bp-wizard">
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[members]" <?php checked( empty( $existing_pages['members'] ) ); ?> value="<?php echo $members_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ) ?> <?php echo home_url( $members_slug ); ?>/</label></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $members_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['members']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[members]" <?php checked( !empty( $existing_pages['members'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $members_page_dropdown ?></label></p>
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[groups]" <?php checked( empty( $existing_pages['groups'] ) ); ?> value="<?php echo $groups_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $groups_slug ); ?>/</label></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $groups_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['groups']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[groups]" <?php checked( !empty( $existing_pages['groups'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $groups_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[blogs]" <?php checked( empty( $existing_pages['blogs'] ) ); ?> value="<?php echo $blogs_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $blogs_slug ); ?>/</label></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $blogs_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['blogs']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[blogs]" <?php checked( !empty( $existing_pages['blogs'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $blogs_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[activity]" <?php checked( empty( $existing_pages['activity'] ) ); ?> value="<?php echo $activity_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $activity_slug ); ?>/</label></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $activity_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['activity']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[activity]" <?php checked( !empty( $existing_pages['activity'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $activity_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[forums]" <?php checked( empty( $existing_pages['forums'] ) ); ?> value="<?php echo $forums_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $forums_slug ); ?>/</label></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $forums_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['forums']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[forums]" <?php checked( !empty( $existing_pages['forums'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $forums_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[register]" <?php checked( empty( $existing_pages['register'] ) ); ?> value="<?php echo $register_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ) ?> <?php echo home_url( $register_slug ) ?>/</label></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $register_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['register']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[register]" <?php checked( !empty( $existing_pages['register'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $register_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[activate]" <?php checked( empty( $existing_pages['activate'] ) ); ?> value="<?php echo $activation_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $activation_slug ); ?>/</label></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $activate_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['activate']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
</span><span class="cx"> <p><label><input type="radio" name="bp_pages[activate]" <?php checked( !empty( $existing_pages['activate'] ) ); ?> value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $activate_page_dropdown ?></label></p>
</span><span class="cx"> <?php endif ?>
</span><span class="lines">@@ -517,7 +517,14 @@
</span><span class="cx"> function step_theme() {
</span><span class="cx">
</span><span class="cx"> $installed_plugins = get_plugins();
</span><del>- $installed_themes = get_themes();
</del><ins>+
+ // Backward-compatibility with WP < 3.4 will be removed in a future release
+ if ( bp_get_major_wp_version() >= 3.4 ) {
+ $installed_themes = wp_get_themes();
+ } else {
+ $installed_themes = get_themes();
+ }
+
</ins><span class="cx"> $bp_themes = array();
</span><span class="cx">
</span><span class="cx"> $template_pack_installed = false;
</span><span class="lines">@@ -539,12 +546,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Get theme screenshot
</span><del>- $current_theme = get_current_theme();
</del><ins>+ // Backward-compatibility with WP < 3.4 will be removed in a future release
+ if ( bp_get_major_wp_version() >= 3.4 ) {
+ $current_theme = wp_get_theme();
+ } else {
+ $current_theme = get_current_theme();
+ }
+
</ins><span class="cx"> $screenshot = '';
</span><del>- $themes = get_themes();
</del><span class="cx">
</span><del>- if ( !empty( $themes[$current_theme]['Screenshot'] ) ) {
- $screenshot = trailingslashit( get_stylesheet_directory_uri() ) . $themes[$current_theme]['Screenshot'];
</del><ins>+ if ( !empty( $installed_themes[$current_theme]['Screenshot'] ) ) {
+ $screenshot = trailingslashit( get_stylesheet_directory_uri() ) . $installad_themes[$current_theme]['Screenshot'];
</ins><span class="cx"> } ?>
</span><span class="cx">
</span><span class="cx"> <script type="text/javascript">
</span><span class="lines">@@ -881,7 +893,7 @@
</span><span class="cx">
</span><span class="cx"> function step_theme_save() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $_POST['submit'] ) && isset( $_POST['theme'] ) ) {
</span><span class="cx"> check_admin_referer( 'bpwizard_theme' );
</span><span class="cx">
</span><span class="lines">@@ -1032,14 +1044,14 @@
</span><span class="cx"> */
</span><span class="cx"> function reset_cookie() {
</span><span class="cx"> @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Get the wizard
</span><span class="cx"> *
</span><span class="cx"> * @global type $bp
</span><del>- * @return boolean
</del><ins>+ * @return boolean
</ins><span class="cx"> */
</span><span class="cx"> function bp_get_wizard() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpcorebpcorewpabstractionphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-wpabstraction.php (5977 => 5978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-wpabstraction.php 2012-04-13 12:59:13 UTC (rev 5977)
+++ trunk/bp-core/bp-core-wpabstraction.php 2012-04-13 12:59:21 UTC (rev 5978)
</span><span class="lines">@@ -12,6 +12,19 @@
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Parse the WordPress core version number into the major release
+ *
+ * @since BuddyPress (1.5.2)
+ * @global string $wp_version
+ * @return string
+ */
+function bp_get_major_wp_version() {
+ global $wp_version;
+
+ return (float) $wp_version;
+}
+
+/**
</ins><span class="cx"> * Only add MS-specific abstraction functions if WordPress is not in multisite mode
</span><span class="cx"> */
</span><span class="cx"> if ( !is_multisite() ) {
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (5977 => 5978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2012-04-13 12:59:13 UTC (rev 5977)
+++ trunk/bp-themes/bp-default/functions.php 2012-04-13 12:59:21 UTC (rev 5978)
</span><span class="lines">@@ -87,7 +87,15 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // This theme allows users to set a custom background
</span><del>- add_custom_background( 'bp_dtheme_custom_background_style' );
</del><ins>+ // Backward-compatibility with WP < 3.4 will be removed in a future release
+ if ( bp_get_major_wp_version() >= 3.4 ) {
+ $custom_background_args = array(
+ 'wp-head-callback' => 'bp_dtheme_custom_background_style'
+ );
+ add_theme_support( 'custom-background', $custom_background_args );
+ } else {
+ add_custom_background( 'bp_dtheme_custom_background_style' );
+ }
</ins><span class="cx">
</span><span class="cx"> // Add custom header support if allowed
</span><span class="cx"> if ( !defined( 'BP_DTHEME_DISABLE_CUSTOM_HEADER' ) ) {
</span><span class="lines">@@ -103,7 +111,16 @@
</span><span class="cx"> set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
</span><span class="cx">
</span><span class="cx"> // Add a way for the custom header to be styled in the admin panel that controls custom headers.
</span><del>- add_custom_image_header( 'bp_dtheme_header_style', 'bp_dtheme_admin_header_style' );
</del><ins>+ // Backward-compatibility with WP < 3.4 will be removed in a future release
+ if ( bp_get_major_wp_version() >= 3.4 ) {
+ $custom_header_args = array(
+ 'wp-head-callback' => 'bp_dtheme_header_style',
+ 'admin-head-callback' => 'bp_dtheme_admin_header_style'
+ );
+ add_theme_support( 'custom-header', $custom_header_args );
+ } else {
+ add_custom_image_header( 'bp_dtheme_header_style', 'bp_dtheme_admin_header_style' );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !is_admin() ) {
</span></span></pre>
</div>
</div>
</body>
</html>