Files ./wordpress-mu/wp-content/blogs.dir/1/files/buddypress102.zip and ../wordpress-mu/wp-content/blogs.dir/1/files/buddypress102.zip differ
diff -urN --exclude='*htaccess*' --exclude='*wp-config*' ./wordpress-mu/wp-content/plugins/buddypress/bp-blogs/bp-blogs-classes.php ../wordpress-mu/wp-content/plugins/buddypress/bp-blogs/bp-blogs-classes.php
--- ./wordpress-mu/wp-content/plugins/buddypress/bp-blogs/bp-blogs-classes.php 2009-06-25 01:07:40 +0400
+++ ../wordpress-mu/wp-content/plugins/buddypress/bp-blogs/bp-blogs-classes.php 2009-07-09 20:36:47 +0400
@@ -394,6 +394,45 @@
return $posts;
}
+
+ function get_latest_posts_by_page( $blog_id = null, $page = 0, $limit = 1 ) {
+ global $wpdb, $bp;
+
+ if ( !$bp->blogs )
+ bp_blogs_setup_globals();
+
+ if ( $blog_id )
+ $blog_sql = $wpdb->prepare( " AND p.blog_id = %d", $blog_id );
+
+ $skip = $page * $limit;
+
+ $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 $blog_sql ORDER BY p.date_created DESC LIMIT $skip, $limit" ) );
+
+ for ( $i = 0; $i < count($post_ids); $i++ ) {
+ $posts[$i] = BP_Blogs_Post::fetch_post_content($post_ids[$i]);
+ }
+
+ return $posts;
+ }
+
+ function get_number_of_post_pages( $blog_id = null, $num_posts = 5 ) {
+ global $wpdb, $bp;
+
+ echo "DEBUG: num_posts is: $num_posts";
+ if ( !$bp->blogs )
+ bp_blogs_setup_globals();
+
+ if ( $blog_id )
+ $blog_sql = $wpdb->prepare( " AND p.blog_id = %d", $blog_id );
+
+ $count_array = $wpdb->get_results( $wpdb->prepare( "SELECT COUNT(post_id) as count FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 $blog_sql ORDER BY p.date_created DESC") );
+
+ $count = (int)$count_array[0]->count;
+
+ $numpages = ceil( $count / $num_posts);
+
+ return $numpages;
+ }
function get_posts_for_user( $user_id = null ) {
global $bp, $wpdb;
@@ -662,4 +701,4 @@
}
-?>
\ No newline at end of file
+?>
diff -urN --exclude='*htaccess*' --exclude='*wp-config*' ./wordpress-mu/wp-content/plugins/buddypress/bp-blogs/bp-blogs-widgets.php ../wordpress-mu/wp-content/plugins/buddypress/bp-blogs/bp-blogs-widgets.php
--- ./wordpress-mu/wp-content/plugins/buddypress/bp-blogs/bp-blogs-widgets.php 2009-06-25 01:07:40 +0400
+++ ../wordpress-mu/wp-content/plugins/buddypress/bp-blogs/bp-blogs-widgets.php 2009-07-09 20:39:31 +0400
@@ -17,19 +17,32 @@
function bp_blogs_widget_recent_posts($args) {
global $current_blog;
-
+
+ echo "DEBUG: printing args next.. \n";
+ print_r($args);
+
extract($args);
+
$options = get_blog_option( $current_blog->blog_id, 'bp_blogs_widget_recent_posts' );
if ( empty( $options['max_posts'] ) || !$options['max_posts'] )
$options['max_posts'] = 5;
+
+ if ( empty( $options['page'] ) || !$options['page'] )
+ $options['page'] = 0;
+
?>
<?php echo $before_widget; ?>
<?php echo $before_title
. $widget_name
. $after_title; ?>
- <?php $posts = bp_blogs_get_latest_posts( null, $options['max_posts'] ) ?>
+ <?php $posts = bp_blogs_get_latest_posts_by_page( null, $options['page'], $options['max_posts'] ) ?>
+ <?php $pages = bp_blogs_get_number_of_post_pages( null, $options['max_posts'] ) ?>
+ <?php echo "DEBUG: number of pages: $pages"; ?>
+ <? $curpage = $page;
+ echo "DEBUG curpage : $curpage";?>
+
<?php $counter = 0; ?>
<?php if ( $posts ) : ?>
@@ -60,6 +73,13 @@
</div>
<?php endif; ?>
+<?php
+ if ($pages != $page) {?>
+ <a href="?page=<?php echo $page++; ?>">Дальше</a>";
+<?
+ }
+?>
+
<?php echo $after_widget; ?>
<?php
}
@@ -70,7 +90,8 @@
$options = $newoptions = get_blog_option( $current_blog->blog_id, 'bp_blogs_widget_recent_posts');
if ( $_POST['bp-blogs-widget-recent-posts-submit'] ) {
- $newoptions['max_posts'] = strip_tags( stripslashes( $_POST['bp-blogs-widget-recent-posts-max'] ) );
+ $newoptions['max_posts'] = strip_tags( stripslashes( $_POST['bp-blogs-widget-recent-posts-max'] ) );
+ $newoptions['page']= strip_tags( stripslashes( $_POST['bp-blogs-widget-recent-posts-page'] ) );
}
if ( $options != $newoptions ) {
@@ -80,8 +101,10 @@
?>
<p><label for="bp-blogs-widget-recent-posts-max"><?php _e('Max Number of Posts:', 'buddypress'); ?> <input class="widefat" id="bp-blogs-widget-recent-posts-max" name="bp-blogs-widget-recent-posts-max" type="text" value="<?php echo attribute_escape( $options['max_posts'] ); ?>" style="width: 30%" /></label></p>
- <input type="hidden" id="bp-blogs-widget-recent-posts-submit" name="bp-blogs-widget-recent-posts-submit" value="1" />
+ <p><label for="bp-blogs-widget-recent-posts-page"><?php _e('Page number:', 'buddypress'); ?> <input class="widefat" id="bp-blogs-widget-recent-posts-page" name="bp-blogs-widget-recent-posts-page" type="text" value="<?php echo attribute_escape( $options['page'] ); ?>" style="width: 30%" /></label></p>
+ <input type="hidden" id="bp-blogs-widget-recent-posts-submit" name="bp-blogs-widget-recent-posts-submit" value="1" />
+
<?php
}
+?>
-?>
\ No newline at end of file
diff -urN --exclude='*htaccess*' --exclude='*wp-config*' ./wordpress-mu/wp-content/plugins/buddypress/bp-blogs.php ../wordpress-mu/wp-content/plugins/buddypress/bp-blogs.php
--- ./wordpress-mu/wp-content/plugins/buddypress/bp-blogs.php 2009-06-25 01:07:40 +0400
+++ ../wordpress-mu/wp-content/plugins/buddypress/bp-blogs.php 2009-07-09 19:51:40 +0400
@@ -614,6 +614,14 @@
return BP_Blogs_Blog::get_random( $limit, $page );
}
+function bp_blogs_get_latest_posts_by_page( $blog_id = null, $page = null, $limit = 5 ) {
+ return BP_Blogs_Post::get_latest_posts_by_page ( $blog_id, $page, $limit );
+}
+
+function bp_blogs_get_number_of_post_pages( $max_posts = 5 ) {
+ return BP_Blogs_Post::get_number_of_post_pages( $max_posts);
+}
+
function bp_blogs_get_all_posts( $limit = null, $page = null ) {
return BP_Blogs_Post::get_all( $limit, $page );
}
@@ -858,4 +866,4 @@
-?>
\ No newline at end of file
+?>
diff -urN --exclude='*htaccess*' --exclude='*wp-config*' ./wordpress-mu/wp-content/themes/default/list.php ../wordpress-mu/wp-content/themes/default/list.php
--- ./wordpress-mu/wp-content/themes/default/list.php 1970-01-01 03:00:00 +0300
+++ ../wordpress-mu/wp-content/themes/default/list.php 2009-07-09 20:31:10 +0400
@@ -0,0 +1,17 @@
+<?php
+/*
+ * Template Name: list
+ * */
+?>
+
+<?php get_header(); ?>
+
+<div id="mainleft">
+
+<div class="post">
+<?php bp_blogs_widget_recent_posts( array( 'page' => $_GET['page'], 'max_posts' => '10' )); ?>
+<div class="postspace"></div>
+
+</div></div>
+
+<?php include (TEMPLATEPATH . '/footer.php'); ?>