Changeset 378

Timestamp:

10/09/2008 05:38:14 AM (18 years ago)

Author:

apeatling

Message:

• Switched activity stream caching back on after changes were committed with it turned off.
• Updated admin bar to not show blog authors on root blog.

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-core/bp-core-adminbar.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-classes.php

@@ -107 +107 @@
                 $last_cached = get_usermeta( $bp['current_userid'], 'bp_activity_last_cached' );
                 
-                if ( strtotime( BP_ACTIVITY_CACHE_LENGTH, (int)$last_cached ) <= time() ) {
+                if ( strtotime( BP_ACTIVITY_CACHE_LENGTH, (int)$last_cached ) >= time() ) {
                         
                         //echo '<small style="color: green">** Debug: Using Cache **</small>';

trunk/bp-core/bp-core-adminbar.php

@@ -2 +2 @@
 
 function bp_core_admin_bar() {
-        global $bp, $wpdb;
+        global $bp, $wpdb, $current_blog;
 
         if ( is_user_logged_in() && bp_core_user_has_home() ) {
@@ -71 +71 @@
                         echo '</li>';
                 }
+                
+                if ( $current_blog->blog_id > 1 ) {
+                        if ( bp_core_is_home_base( $current_blog->blog_id ) ) {
+                                // TODO: possible menu for current group/user/photo etc
+                        } else {
+                                $authors = get_users_of_blog(); 
+                        
+                                if ( is_array( $authors ) ) {
+                                        /* This is a blog, render a menu with links to all authors */
+                                        echo '<li><a href="/">';
+                                        _e('Blog Authors');
+                                        echo '</a>';
+                                
+                                        echo '<ul class="author-list">';
+                                        foreach( $authors as $author ) {
+                                                $author = new BP_Core_User( $author->user_id );
+                                                echo '<li>';
 
-                if ( bp_core_is_home_base( $wpdb->blogid ) ) {
-                        // TODO: possible menu for current group/user/photo etc
-                } else {
-                        $authors = get_users_of_blog(); 
-                        
-                        if ( is_array( $authors ) ) {
-                                /* This is a blog, render a menu with links to all authors */
-                                echo '<li><a href="/">';
-                                _e('Blog Authors');
-                                echo '</a>';
-                                
-                                echo '<ul class="author-list">';
-                                foreach( $authors as $author ) {
-                                        $author = new BP_Core_User( $author->user_id );
-                                        echo '<li>';
-
-                                        echo '<div class="admin-bar-clear"><a href="' . $author->user_url . '">';
-                                        echo $author->avatar_mini;
-                                        echo ' ' . $author->fullname;
-                                        echo '<span class="activity">' . $author->last_active . '</span>';
-                                        echo '</a>';
-                                        echo '</div>';
+                                                echo '<div class="admin-bar-clear"><a href="' . $author->user_url . '">';
+                                                echo $author->avatar_mini;
+                                                echo ' ' . $author->fullname;
+                                                echo '<span class="activity">' . $author->last_active . '</span>';
+                                                echo '</a>';
+                                                echo '</div>';
+                                                echo '</li>';
+                                        }
+                                        echo '</ul>';
                                         echo '</li>';
                                 }
-                                echo '</ul>';
-                                echo '</li>';
                         }
                 }
-                                
+                        
                 echo '</ul>';
                 echo '</div>';