Changeset 3748

Timestamp:

01/19/2011 11:15:29 PM (16 years ago)

Author:

djpaul

Message:

Move bp-default deprecated functions out of functions.php.

Location:

trunk

Files:

• bp-core/bp-core-deprecated.php (modified) (1 diff)
• bp-themes/bp-default/functions.php (modified) (1 diff)

trunk/bp-core/bp-core-deprecated.php

@@ -58 +58 @@
 }
 
+/**
+ * Contains functions which were moved out of BP-Default's functions.php in BuddyPress 1.3.
+ *
+ * @since 1.3
+ */
+function bp_dtheme_deprecated() {
+        if ( !function_exists( 'bp_dtheme_wp_pages_filter' ) ) :
+        /**
+         * In BuddyPress 1.2.x, this function filtered the dropdown on the Settings > Reading screen for selecting
+         * the page to show on front to include "Activity Stream."
+         * As of 1.3.x, it is no longer required.
+         *
+         * @deprecated 1.3
+         * @deprecated No longer required.
+         * @param string $page_html A list of pages as a dropdown (select list)
+         * @return string
+         * @see wp_dropdown_pages()
+         * @since 1.2
+         */
+        function bp_dtheme_wp_pages_filter( $page_html ) {
+                _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
+                return $page_html;
+        }
+        endif;
 
+        if ( !function_exists( 'bp_dtheme_page_on_front_update' ) ) :
+        /**
+         * In BuddyPress 1.2.x, this function hijacked the saving of page on front setting to save the activity stream setting.
+         * As of 1.3.x, it is no longer required.
+         *
+         * @deprecated 1.3
+         * @deprecated No longer required.
+         * @param $string $oldvalue Previous value of get_option( 'page_on_front' )
+         * @param $string $oldvalue New value of get_option( 'page_on_front' )
+         * @return string
+         * @since 1.2
+         */
+        function bp_dtheme_page_on_front_update( $oldvalue, $newvalue ) {
+                _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
+                if ( !is_admin() || !is_super_admin() )
+                        return false;
+
+                return $oldvalue;
+        }
+        endif;
+
+        if ( !function_exists( 'bp_dtheme_page_on_front_template' ) ) :
+        /**
+         * In BuddyPress 1.2.x, this function loaded the activity stream template if the front page display settings allow.
+         * As of 1.3.x, it is no longer required.
+         *
+         * @deprecated 1.3
+         * @deprecated No longer required.
+         * @param string $template Absolute path to the page template
+         * @return string
+         * @since 1.2
+         */
+        function bp_dtheme_page_on_front_template( $template ) {
+                _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
+                return $template;
+        }
+        endif;
+
+        if ( !function_exists( 'bp_dtheme_fix_get_posts_on_activity_front' ) ) :
+        /**
+         * In BuddyPress 1.2.x, this forced the page ID as a string to stop the get_posts query from kicking up a fuss.
+         * As of 1.3.x, it is no longer required.
+         *
+         * @deprecated 1.3
+         * @deprecated No longer required.
+         * @since 1.2
+         */
+        function bp_dtheme_fix_get_posts_on_activity_front() {
+                _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
+        }
+        endif;
+
+        if ( !function_exists( 'bp_dtheme_fix_the_posts_on_activity_front' ) ) :
+        /**
+         * In BuddyPress 1.2.x, this was used as part of the code that set the activity stream to be on the front page.
+         * As of 1.3.x, it is no longer required.
+         *
+         * @deprecated 1.3
+         * @deprecated No longer required.
+         * @param array $posts Posts as retrieved by WP_Query
+         * @return array
+         * @since 1.2.5
+         */
+        function bp_dtheme_fix_the_posts_on_activity_front( $posts ) {
+                _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
+                return $posts;
+        }
+        endif;
+
+        if ( !function_exists( 'bp_dtheme_add_blog_comments_js' ) ) :
+        /**
+         * In BuddyPress 1.2.x, this added the javascript needed for blog comment replies.
+         * As of 1.3.x, we recommend that you enqueue the comment-reply javascript in your theme's header.php.
+         *
+         * @deprecated 1.3
+         * @deprecated Enqueue the comment-reply script in your theme's header.php.
+         * @since 1.2
+         */
+        function bp_dtheme_add_blog_comments_js() {
+                _deprecated_function( __FUNCTION__, '1.3', "Enqueue the comment-reply script in your theme's header.php." );
+                if ( is_singular() && bp_is_blog_page() && get_option( 'thread_comments' ) )
+                        wp_enqueue_script( 'comment-reply' );
+        }
+        endif;
+}
+add_action( 'after_setup_theme', 'bp_dtheme_deprecated', 15 );
 ?>

trunk/bp-themes/bp-default/functions.php

@@ -626 +626 @@
 add_action( 'comment_form', 'bp_dtheme_after_comment_form' );
 endif;
-
-// Everything beyond this point is deprecated as of BuddyPress 1.3. This will be removed in a future version.
-
-if ( BP_VERSION < 1.3 ) :
-
-/**
- * In BuddyPress 1.2.x, this function filtered the dropdown on the Settings > Reading screen for selecting
- * the page to show on front to include "Activity Stream."
- * As of 1.3.x, it is no longer required.
- *
- * @deprecated 1.3
- * @deprecated No longer required.
- * @param string $page_html A list of pages as a dropdown (select list)
- * @return string
- * @see wp_dropdown_pages()
- * @since 1.2
- */
-function bp_dtheme_wp_pages_filter( $page_html ) {
-        _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
-        return $page_html;
-}
-
-/**
- * In BuddyPress 1.2.x, this function hijacked the saving of page on front setting to save the activity stream setting.
- * As of 1.3.x, it is no longer required.
- *
- * @deprecated 1.3
- * @deprecated No longer required.
- * @param $string $oldvalue Previous value of get_option( 'page_on_front' )
- * @param $string $oldvalue New value of get_option( 'page_on_front' )
- * @return string
- * @since 1.2
- */
-function bp_dtheme_page_on_front_update( $oldvalue, $newvalue ) {
-        _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
-        if ( !is_admin() || !is_super_admin() )
-                return false;
-
-        return $oldvalue;
-}
-
-/**
- * In BuddyPress 1.2.x, this function loaded the activity stream template if the front page display settings allow.
- * As of 1.3.x, it is no longer required.
- *
- * @deprecated 1.3
- * @deprecated No longer required.
- * @param string $template Absolute path to the page template
- * @return string
- * @since 1.2
- */
-function bp_dtheme_page_on_front_template( $template ) {
-        _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
-        return $template;
-}
-
-/**
- * In BuddyPress 1.2.x, this forced the page ID as a string to stop the get_posts query from kicking up a fuss.
- * As of 1.3.x, it is no longer required.
- *
- * @deprecated 1.3
- * @deprecated No longer required.
- * @since 1.2
- */
-function bp_dtheme_fix_get_posts_on_activity_front() {
-        _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
-}
-
-/**
- * In BuddyPress 1.2.x, this was used as part of the code that set the activity stream to be on the front page.
- * As of 1.3.x, it is no longer required.
- *
- * @deprecated 1.3
- * @deprecated No longer required.
- * @param array $posts Posts as retrieved by WP_Query
- * @return array
- * @since 1.2.5
- */
-function bp_dtheme_fix_the_posts_on_activity_front( $posts ) {
-        _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
-        return $posts;
-}
-
-/**
- * In BuddyPress 1.2.x, this added the javascript needed for blog comment replies.
- * As of 1.3.x, we recommend that you enqueue the comment-reply javascript in your theme's header.php.
- *
- * @deprecated 1.3
- * @deprecated Enqueue the comment-reply script in your theme's header.php.
- * @since 1.2
- */
-function bp_dtheme_add_blog_comments_js() {
-        _deprecated_function( __FUNCTION__, '1.3', "Enqueue the comment-reply script in your theme's header.php." );
-        if ( is_singular() && bp_is_blog_page() && get_option( 'thread_comments' ) )
-                wp_enqueue_script( 'comment-reply' );
-}
-endif;
-
 ?>