Changeset 4053

Timestamp:

02/18/2011 03:23:04 AM (14 years ago)

Author:

djpaul

Message:

Move root component page creation code out of deprecated file.
Also tidy up of a teeny bit of PHPDoc.

Location:

trunk/bp-core

Files:

• bp-core-functions.php (modified) (3 diffs)
• deprecated/1.3.php (modified) (2 diffs)

trunk/bp-core/bp-core-functions.php

@@ -16 +16 @@
  * Fetches BP pages from the meta table, depending on setup
  *
- * @package BuddyPress Core Core
+ * @package BuddyPress Core
  */
 function bp_core_get_page_meta() {
@@ -30 +30 @@
  * Stores BP pages in the meta table, depending on setup
  *
- * @package BuddyPress Core Core
+ * @package BuddyPress Core 
  */
 function bp_core_update_page_meta( $page_ids ) {
@@ -722 +722 @@
 }
 
+/**
+ * This function originally let plugins add support for pages in the root of the install.
+ * These root level pages are now handled by actual WordPress pages and this function is now
+ * a convenience for compatibility with the new method.
+ *
+ * @global $bp BuddyPress global settings
+ * @param $slug str The slug of the component
+ */
+function bp_core_add_root_component( $slug ) {
+    global $bp;
+
+    if ( empty( $bp->pages ) )
+        $bp->pages = bp_core_get_page_names();
+
+    $match = false;
+
+    // Check if the slug is registered in the $bp->pages global
+    foreach ( (array)$bp->pages as $key => $page ) {
+        if ( $key == $slug || $page->slug == $slug )
+            $match = true;
+    }
+
+    // If there was no match, add a page for this root component
+    if ( empty( $match ) ) {
+        $bp->add_root[] = $slug;
+        add_action( 'bp_init', 'bp_core_create_root_component_page' );
+    }
+}
+
+function bp_core_create_root_component_page() {
+    global $bp;
+
+    $new_page_ids = array();
+
+    foreach ( (array)$bp->add_root as $slug )
+        $new_page_ids[$slug] = wp_insert_post( array( 'comment_status' => 'closed', 'ping_status' => 'closed', 'post_title' => ucwords( $slug ), 'post_status' => 'publish', 'post_type' => 'page' ) );
+
+    $page_ids = array_merge( (array) $new_page_ids, (array) bp_core_get_page_meta() );
+    bp_core_update_page_meta( $page_ids );
+}
 ?>

trunk/bp-core/deprecated/1.3.php

@@ -286 +286 @@
 
 <?php
-}
-
-/**
- * This function originally let plugins add support for pages in the root of the install.
- * These pages are now handled by actual WordPress pages so this function is deprecated.
- * It now simply facilitates backwards compatibility by adding a WP page if the plugin has not been
- * updated to do so.
- *
- * @deprecated 1.3
- * @deprecated Use wp_insert_post() to create a page
- * @package BuddyPress Core
- * @param $slug str The slug of the component
- * @global $bp BuddyPress global settings
- */
-function bp_core_add_root_component( $slug ) {
-    global $bp;
-
-    _deprecated_function( __FUNCTION__, '1.3', 'wp_insert_post()' );
-    if ( empty( $bp->pages ) )
-        $bp->pages = bp_core_get_page_names();
-
-    $match = false;
-
-    // Check if the slug is registered in the $bp->pages global
-    foreach ( (array)$bp->pages as $key => $page ) {
-        if ( $key == $slug || $page->slug == $slug )
-            $match = true;
-    }
-
-    // If there was no match, add a page for this root component
-    if ( empty( $match ) ) {
-        $bp->add_root[] = $slug;
-        add_action( 'bp_init', 'bp_core_create_root_component_page' );
-    }
-}
-
-function bp_core_create_root_component_page() {
-    global $bp;
-
-    $new_page_ids = array();
-
-    foreach ( (array)$bp->add_root as $slug )
-        $new_page_ids[$slug] = wp_insert_post( array( 'comment_status' => 'closed', 'ping_status' => 'closed', 'post_title' => ucwords( $slug ), 'post_status' => 'publish', 'post_type' => 'page' ) );
-
-    $page_ids = bp_core_get_page_meta();
-    $page_ids = (array) $page_ids;
-    $page_ids = array_merge( (array) $new_page_ids, (array) $page_ids );
-
-    bp_core_update_page_meta( $page_ids );
 }
 
@@ -491 +442 @@
 }
 add_action( 'after_setup_theme', 'bp_dtheme_deprecated', 15 );
-
 ?>