Changeset 3736 for trunk/bp-blogs.php

Timestamp:

01/18/2011 10:46:09 PM (14 years ago)

Author:

boonebgorges

Message:

Modifies upgrade routine so that a site's front-end can continue to be accessible after a BP upgrade but before the wizard has been completed. Adds upgrade nags to the Dashboard. Fixes #2789. Props r-a-y and DJPaul for earlier patches and help testing

File:

• trunk/bp-blogs.php (modified) (2 diffs)

trunk/bp-blogs.php

@@ -14 +14 @@
     if ( !defined( 'BP_BLOGS_SLUG' ) && isset( $bp->pages->blogs->slug ) )
         define ( 'BP_BLOGS_SLUG', bp_core_component_slug_from_root_slug( $bp->pages->blogs->slug ) );
-    else if( !defined( 'BP_BLOGS_SLUG' ) )
+    else if ( !defined( 'BP_BLOGS_SLUG' ) )
         define ( 'BP_BLOGS_SLUG', 'blogs' );
 
     // For internal identification
     $bp->blogs->id   = 'blogs';
-    $bp->blogs->name = $bp->pages->blogs->name;
+    $bp->blogs->name = !empty( $bp->pages->blogs->name ) ? $bp->pages->blogs->name : 'blogs';
 
     // Slugs
     $bp->blogs->slug      = BP_BLOGS_SLUG;
-    $bp->blogs->root_slug = $bp->pages->blogs->slug;
+    $bp->blogs->root_slug = !empty( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG;
 
     // Tables
@@ -558 +558 @@
 function bp_blogs_remove_post( $post_id, $blog_id = false, $user_id = false ) {
     global $current_blog, $bp;
+    
+    if ( empty( $current_blog->blog_id ) )
+        return false;
 
     $post_id = (int)$post_id;