<!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][3748] trunk: Move bp-default deprecated functions out of functions.php.</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>3748</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-01-19 23:15:29 +0000 (Wed, 19 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move bp-default deprecated functions out of functions.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoredeprecatedphp">trunk/bp-core/bp-core-deprecated.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="trunkbpcorebpcoredeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-deprecated.php (3747 => 3748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-deprecated.php        2011-01-19 15:30:31 UTC (rev 3747)
+++ trunk/bp-core/bp-core-deprecated.php        2011-01-19 23:15:29 UTC (rev 3748)
</span><span class="lines">@@ -57,5 +57,115 @@
</span><span class="cx">         bp_core_update_page_meta( $page_ids );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * 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;
</ins><span class="cx">
</span><del>-?>
</del><ins>+        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 );
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (3747 => 3748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php        2011-01-19 15:30:31 UTC (rev 3747)
+++ trunk/bp-themes/bp-default/functions.php        2011-01-19 23:15:29 UTC (rev 3748)
</span><span class="lines">@@ -625,102 +625,4 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'comment_form', 'bp_dtheme_after_comment_form' );
</span><span class="cx"> endif;
</span><del>-
-// 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;
-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>