Message info
 
To:buddypress-trac@lists.automattic.com From:buddypress-trac@lists.automattic.com Subject:[buddypress-trac] [BuddyPress][6089] trunk: Remove pre-WordPress 3. 4 compatibility checks from trunk. Date:Wed, 13 Jun 2012 21:36:57 +0000 (UTC)
 

Revision
6089
Author
johnjamesjacoby
Date
2012-06-13 21:36:57 +0000 (Wed, 13 Jun 2012)

Log Message

Remove pre-WordPress 3.4 compatibility checks from trunk.

Modified Paths

Diff

Modified: trunk/bp-core/admin/bp-core-functions.php (6088 => 6089)


--- trunk/bp-core/admin/bp-core-functions.php	2012-06-13 21:00:27 UTC (rev 6088)
+++ trunk/bp-core/admin/bp-core-functions.php	2012-06-13 21:36:57 UTC (rev 6089)
@@ -239,12 +239,7 @@
 	 */
 
 	// Get current theme info
-	// 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();
-	}
+	$ct = current_theme_info();
 
 	// Make sure tags is an array to suppress notices
 	if ( ! isset( $ct->tags ) )

Modified: trunk/bp-core/admin/bp-core-update.php (6088 => 6089)


--- trunk/bp-core/admin/bp-core-update.php	2012-06-13 21:00:27 UTC (rev 6088)
+++ trunk/bp-core/admin/bp-core-update.php	2012-06-13 21:36:57 UTC (rev 6089)
@@ -517,14 +517,7 @@
 	function step_theme() {
 
 		$installed_plugins = get_plugins();
-
-		// 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();
-		}
-
+		$installed_themes  = get_themes();
 		$bp_themes         = array();
 
 		$template_pack_installed = false;
@@ -546,13 +539,7 @@
 		}
 
 		// Get theme screenshot
-		// 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();
-		}
-
+		$current_theme = wp_get_theme();
 		$screenshot    = '';
 
 		if ( !empty( $installed_themes[$current_theme]['Screenshot'] ) ) {

Modified: trunk/bp-themes/bp-default/functions.php (6088 => 6089)


--- trunk/bp-themes/bp-default/functions.php	2012-06-13 21:00:27 UTC (rev 6088)
+++ trunk/bp-themes/bp-default/functions.php	2012-06-13 21:36:57 UTC (rev 6089)
@@ -86,15 +86,10 @@
 	) );
 
 	// This theme allows users to set a custom background
-	// 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' );
-	}
+	$custom_background_args = array(
+		'wp-head-callback' => 'bp_dtheme_custom_background_style'
+	);
+	add_theme_support( 'custom-background', $custom_background_args );
 
 	// Add custom header support if allowed
 	if ( !defined( 'BP_DTHEME_DISABLE_CUSTOM_HEADER' ) ) {
@@ -110,16 +105,11 @@
 		set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
 
 		// Add a way for the custom header to be styled in the admin panel that controls custom headers.
-		// 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' );
-		}
+		$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 );
 	}
 
 	if ( !is_admin() ) {
@@ -798,4 +788,4 @@
 }
 add_action( 'bp_before_header', 'bp_dtheme_remove_nojs_body_class' );
 
-?>
\ No newline at end of file
+?>