Changeset 2077 for trunk/bp-wire/bp-wire-templatetags.php

Timestamp:

11/02/2009 07:54:21 PM (16 years ago)

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

• trunk/bp-wire/bp-wire-templatetags.php (modified) (20 diffs)

trunk/bp-wire/bp-wire-templatetags.php

@@ -6 +6 @@
     var $wire_posts;
     var $wire_post;
-    
+
     var $in_the_loop;
-    
+
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_wire_post_count;
-    
+
     var $can_post;
-    
+
     var $table_name;
-    
+
     function bp_wire_posts_template( $item_id, $component_slug, $can_post, $per_page, $max ) {
         global $bp;
@@ -25 +25 @@
         } else
             $this->table_name = $bp->{$bp->active_components[$component_slug]}->table_name_wire;
-        
+
         $this->pag_page = isset( $_REQUEST['wpage'] ) ? intval( $_REQUEST['wpage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
@@ -31 +31 @@
         $this->wire_posts = BP_Wire_Post::get_all_for_item( $item_id, $this->table_name, $this->pag_page, $this->pag_num );
         $this->total_wire_post_count = (int)$this->wire_posts['count'];
-        
+
         $this->wire_posts = $this->wire_posts['wire_posts'];
         $this->wire_post_count = count($this->wire_posts);
-        
+
         if ( is_site_admin() || ( (int)get_site_option('non-friend-wire-posting') && ( $bp->current_component == $bp->profile->slug || $bp->current_component == $bp->wire->slug ) ) )
             $this->can_post = 1;
         else
             $this->can_post = $can_post;
-        
+
         $this->pag_links = paginate_links( array(
             'base' => add_query_arg( 'wpage', '%#%', $bp->displayed_user->domain ),
@@ -49 +49 @@
             'mid_size' => 1
         ));
-        
-    }
-    
+
+    }
+
     function has_wire_posts() {
         if ( $this->wire_post_count )
             return true;
-        
+
         return false;
     }
-    
+
     function next_wire_post() {
         $this->current_wire_post++;
         $this->wire_post = $this->wire_posts[$this->current_wire_post];
-        
+
         return $this->wire_post;
     }
-    
+
     function rewind_wire_posts() {
         $this->current_wire_post = -1;
@@ -72 +72 @@
         }
     }
-    
-    function user_wire_posts() { 
+
+    function user_wire_posts() {
         if ( $this->current_wire_post + 1 < $this->wire_post_count ) {
             return true;
@@ -85 +85 @@
         return false;
     }
-    
+
     function the_wire_post() {
         global $wire_post;
@@ -99 +99 @@
 function bp_has_wire_posts( $args = '' ) {
     global $wire_posts_template, $bp;
-    
+
     $defaults = array(
         'item_id' => false,
@@ -110 +110 @@
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
-    
+
     if ( !$item_id )
         return false;
-        
-    $wire_posts_template = new BP_Wire_Posts_Template( $item_id, $component_slug, $can_post, $per_page, $max );     
+
+    $wire_posts_template = new BP_Wire_Posts_Template( $item_id, $component_slug, $can_post, $per_page, $max );
     return apply_filters( 'bp_has_wire_posts', $wire_posts_template->has_wire_posts(), &$wire_posts_template );
 }
@@ -133 +133 @@
     if ( !$item_id )
         return false;
-    
+
     if ( !$empty_message )
         $empty_message = __("There are currently no wire posts.", 'buddypress');
-    
+
     if ( !$title )
         $title = __('Wire', 'buddypress');
@@ -146 +146 @@
     $bp_wire_can_post = $can_post;
     $bp_wire_show_email_notify = $show_email_notify;
-    
+
     locate_template( array( '/wire/post-list.php' ), true );
 }
@@ -157 +157 @@
         return apply_filters( 'bp_get_wire_title', $bp_wire_header );
     }
-    
+
 function bp_wire_item_id( $deprecated = false ) {
     global $bp_item_id;
-    
+
     if ( $deprecated )
         echo bp_get_wire_item_id();
@@ -179 +179 @@
         return apply_filters( 'bp_get_wire_no_posts_message', $bp_wire_msg );
     }
-    
+
 function bp_wire_can_post() {
     global $bp_wire_can_post;
@@ -192 +192 @@
 function bp_wire_post_id( $deprecated = true ) {
     global $wire_posts_template;
-    
+
     if ( !$deprecated )
         return bp_get_wire_post_id();
@@ -218 +218 @@
     if ( $wire_posts_template->total_wire_post_count > $wire_posts_template->pag_num )
         return true;
-    
+
     return false;
 }
@@ -230 +230 @@
         return apply_filters( 'bp_get_wire_pagination', $wire_posts_template->pag_links );
     }
-    
+
 function bp_wire_pagination_count() {
     echo bp_get_wire_pagination_count();
@@ -238 +238 @@
 
         $from_num = intval( ( $wire_posts_template->pag_page - 1 ) * $wire_posts_template->pag_num ) + 1;
-        $to_num = ( $from_num + ( $wire_posts_template->pag_num - 1) > $wire_posts_template->total_wire_post_count ) ? $wire_posts_template->total_wire_post_count : $from_num + ( $wire_posts_template->pag_num - 1); 
-
-        return apply_filters( 'bp_get_wire_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $wire_posts_template->total_wire_post_count ) );  
-    }
-    
+        $to_num = ( $from_num + ( $wire_posts_template->pag_num - 1) > $wire_posts_template->total_wire_post_count ) ? $wire_posts_template->total_wire_post_count : $from_num + ( $wire_posts_template->pag_num - 1);
+
+        return apply_filters( 'bp_get_wire_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $wire_posts_template->total_wire_post_count ) );
+    }
+
 function bp_wire_ajax_loader_src() {
     echo bp_get_wire_ajax_loader_src();
@@ -262 +262 @@
     function bp_get_wire_post_date() {
         global $wire_posts_template;
-        
+
         return apply_filters( 'bp_get_wire_post_date', mysql2date( get_blog_option( BP_ROOT_BLOG, 'date_format'), $wire_posts_template->wire_post->date_posted ) );
     }
@@ -268 +268 @@
 function bp_wire_post_author_name( $deprecated = true ) {
     global $wire_posts_template;
-    
+
     if ( !$deprecated )
         return bp_get_wire_post_author_name();
@@ -291 +291 @@
 function bp_wire_get_post_form() {
     global $wire_posts_template;
-    
+
     if ( is_user_logged_in() && $wire_posts_template->can_post )
-        locate_template( array( '/wire/post-form.php' ), true );    
+        locate_template( array( '/wire/post-form.php' ), true );
 }
 
@@ -339 +339 @@
         return bp_get_wire_poster_date();
     else
-        echo bp_get_wire_poster_date(); 
+        echo bp_get_wire_poster_date();
 }
     function bp_get_wire_poster_date() {
-        return apply_filters( 'bp_get_wire_poster_date', mysql2date( get_blog_option( BP_ROOT_BLOG, 'date_format' ), date("Y-m-d H:i:s") ) );   
+        return apply_filters( 'bp_get_wire_poster_date', mysql2date( get_blog_option( BP_ROOT_BLOG, 'date_format' ), date("Y-m-d H:i:s") ) );
     }