Version Description
- Released on September 21, 2011
Download this release
Release Info
Developer | johnjamesjacoby |
Plugin | bbPress |
Version | 2.0 |
Comparing to | |
See all releases |
Code changes from version 2.0-rc-5 to 2.0
- bbp-includes/bbp-common-functions.php +18 -30
- bbp-includes/bbp-core-compatibility.php +28 -20
- bbp-includes/bbp-core-hooks.php +1 -1
- bbp-includes/bbp-forum-functions.php +24 -24
- bbp-themes/bbp-twentyten/functions.php +1 -1
- bbp-themes/bbp-twentyten/single-reply-edit.php +3 -1
- bbp-themes/bbp-twentyten/single-topic-edit.php +3 -1
- bbpress.php +3 -3
- readme.txt +13 -1
- screenshot-1.png +0 -0
- screenshot-2.png +0 -0
- screenshot-3.png +0 -0
- screenshot-4.png +0 -0
- screenshot-5.png +0 -0
- screenshot-6.png +0 -0
- screenshot-7.png +0 -0
bbp-includes/bbp-common-functions.php
CHANGED
@@ -336,7 +336,6 @@ function bbp_get_paged() {
|
|
336 |
* @return array Data
|
337 |
*/
|
338 |
function bbp_fix_post_author( $data = array(), $postarr = array() ) {
|
339 |
-
global $bbp;
|
340 |
|
341 |
// Post is not being updated or the post_author is already 0, return
|
342 |
if ( empty( $postarr['ID'] ) || empty( $data['post_author'] ) )
|
@@ -656,7 +655,6 @@ function bbp_deregister_view( $view ) {
|
|
656 |
* @return bool False if the view doesn't exist, otherwise if topics are there
|
657 |
*/
|
658 |
function bbp_view_query( $view = '', $new_args = '' ) {
|
659 |
-
global $bbp;
|
660 |
|
661 |
if ( !$view = bbp_get_view_id( $view ) )
|
662 |
return false;
|
@@ -684,7 +682,9 @@ function bbp_view_query( $view = '', $new_args = '' ) {
|
|
684 |
function bbp_get_view_query_args( $view ) {
|
685 |
global $bbp;
|
686 |
|
687 |
-
|
|
|
|
|
688 |
return false;
|
689 |
|
690 |
return $bbp->views[$view]['query'];
|
@@ -982,24 +982,19 @@ function bbp_check_for_blacklist( $anonymous_data = false, $author_id = 0, $titl
|
|
982 |
* and topic id
|
983 |
* @return bool True on success, false on failure
|
984 |
*/
|
985 |
-
function bbp_notify_subscribers( $reply_id = 0 ) {
|
986 |
global $wpdb;
|
987 |
|
988 |
// Bail if subscriptions are turned off
|
989 |
if ( !bbp_is_subscriptions_active() )
|
990 |
return false;
|
991 |
|
992 |
-
/**
|
993 |
-
|
994 |
-
// Validate reply ID and bail if empty
|
995 |
$reply_id = bbp_get_reply_id( $reply_id );
|
996 |
-
|
997 |
-
|
998 |
-
|
999 |
-
|
1000 |
-
$reply = bbp_get_reply( $reply_id );
|
1001 |
-
if ( empty( $reply ) )
|
1002 |
-
return false;
|
1003 |
|
1004 |
// Bail if reply is not published
|
1005 |
if ( !bbp_is_reply_published( $reply_id ) )
|
@@ -1007,27 +1002,20 @@ function bbp_notify_subscribers( $reply_id = 0 ) {
|
|
1007 |
|
1008 |
/** Topic *****************************************************************/
|
1009 |
|
1010 |
-
//
|
1011 |
-
|
1012 |
-
if ( empty( $topic_id ) )
|
1013 |
-
return false;
|
1014 |
-
|
1015 |
-
// Get the topic and bail if empty
|
1016 |
-
$topic = bbp_get_topic( $topic_id );
|
1017 |
-
if ( empty( $topic ) )
|
1018 |
-
return false;
|
1019 |
-
|
1020 |
-
// Bail if reply is not published
|
1021 |
-
if ( !bbp_is_topic_published( $reply_id ) )
|
1022 |
return false;
|
1023 |
|
1024 |
/** User ******************************************************************/
|
1025 |
|
1026 |
-
// Get
|
1027 |
$user_ids = bbp_get_topic_subscribers( $topic_id, true );
|
1028 |
if ( empty( $user_ids ) )
|
1029 |
return false;
|
1030 |
|
|
|
|
|
|
|
1031 |
/** Mail ******************************************************************/
|
1032 |
|
1033 |
do_action( 'bbp_pre_notify_subscribers', $reply_id, $topic_id, $user_ids );
|
@@ -1036,17 +1024,17 @@ function bbp_notify_subscribers( $reply_id = 0 ) {
|
|
1036 |
foreach ( (array) $user_ids as $user_id ) {
|
1037 |
|
1038 |
// Don't send notifications to the person who made the post
|
1039 |
-
if ( (int) $user_id == (int) $
|
1040 |
continue;
|
1041 |
|
1042 |
// For plugins to filter messages per reply/topic/user
|
1043 |
$message = __( "%1\$s wrote:\n\n%2\$s\n\nPost Link: %3\$s\n\nYou are recieving this email because you subscribed to it. Login and visit the topic to unsubscribe from these emails.", 'bbpress' );
|
1044 |
-
$message = apply_filters( 'bbp_subscription_mail_message', sprintf( $message, $
|
1045 |
if ( empty( $message ) )
|
1046 |
continue;
|
1047 |
|
1048 |
// For plugins to filter titles per reply/topic/user
|
1049 |
-
$subject = apply_filters( 'bbp_subscription_mail_title', '[' . get_option( 'blogname' ) . '] ' . $
|
1050 |
if ( empty( $subject ) )
|
1051 |
continue;
|
1052 |
|
336 |
* @return array Data
|
337 |
*/
|
338 |
function bbp_fix_post_author( $data = array(), $postarr = array() ) {
|
|
|
339 |
|
340 |
// Post is not being updated or the post_author is already 0, return
|
341 |
if ( empty( $postarr['ID'] ) || empty( $data['post_author'] ) )
|
655 |
* @return bool False if the view doesn't exist, otherwise if topics are there
|
656 |
*/
|
657 |
function bbp_view_query( $view = '', $new_args = '' ) {
|
|
|
658 |
|
659 |
if ( !$view = bbp_get_view_id( $view ) )
|
660 |
return false;
|
682 |
function bbp_get_view_query_args( $view ) {
|
683 |
global $bbp;
|
684 |
|
685 |
+
$views = bbp_get_view_id( $view );
|
686 |
+
|
687 |
+
if ( empty( $views ) )
|
688 |
return false;
|
689 |
|
690 |
return $bbp->views[$view]['query'];
|
982 |
* and topic id
|
983 |
* @return bool True on success, false on failure
|
984 |
*/
|
985 |
+
function bbp_notify_subscribers( $reply_id = 0, $topic_id = 0, $forum_id = 0, $anonymous_data = false, $reply_author = 0 ) {
|
986 |
global $wpdb;
|
987 |
|
988 |
// Bail if subscriptions are turned off
|
989 |
if ( !bbp_is_subscriptions_active() )
|
990 |
return false;
|
991 |
|
992 |
+
/** Validation ************************************************************/
|
|
|
|
|
993 |
$reply_id = bbp_get_reply_id( $reply_id );
|
994 |
+
$topic_id = bbp_get_topic_id( $topic_id );
|
995 |
+
$forum_id = bbp_get_reply_id( $forum_id );
|
996 |
+
|
997 |
+
/** Reply *****************************************************************/
|
|
|
|
|
|
|
998 |
|
999 |
// Bail if reply is not published
|
1000 |
if ( !bbp_is_reply_published( $reply_id ) )
|
1002 |
|
1003 |
/** Topic *****************************************************************/
|
1004 |
|
1005 |
+
// Bail if topic is not published
|
1006 |
+
if ( !bbp_is_topic_published( $topic_id ) )
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1007 |
return false;
|
1008 |
|
1009 |
/** User ******************************************************************/
|
1010 |
|
1011 |
+
// Get subscribers and bail if empty
|
1012 |
$user_ids = bbp_get_topic_subscribers( $topic_id, true );
|
1013 |
if ( empty( $user_ids ) )
|
1014 |
return false;
|
1015 |
|
1016 |
+
// Poster name
|
1017 |
+
$reply_author_name = bbp_get_reply_author_display_name( $reply_id );
|
1018 |
+
|
1019 |
/** Mail ******************************************************************/
|
1020 |
|
1021 |
do_action( 'bbp_pre_notify_subscribers', $reply_id, $topic_id, $user_ids );
|
1024 |
foreach ( (array) $user_ids as $user_id ) {
|
1025 |
|
1026 |
// Don't send notifications to the person who made the post
|
1027 |
+
if ( !empty( $reply_author ) && (int) $user_id == (int) $reply_author )
|
1028 |
continue;
|
1029 |
|
1030 |
// For plugins to filter messages per reply/topic/user
|
1031 |
$message = __( "%1\$s wrote:\n\n%2\$s\n\nPost Link: %3\$s\n\nYou are recieving this email because you subscribed to it. Login and visit the topic to unsubscribe from these emails.", 'bbpress' );
|
1032 |
+
$message = apply_filters( 'bbp_subscription_mail_message', sprintf( $message, $reply_author_name, strip_tags( bbp_get_reply_content( $reply_id ) ), bbp_get_reply_url( $reply_id ) ), $reply_id, $topic_id, $user_id );
|
1033 |
if ( empty( $message ) )
|
1034 |
continue;
|
1035 |
|
1036 |
// For plugins to filter titles per reply/topic/user
|
1037 |
+
$subject = apply_filters( 'bbp_subscription_mail_title', '[' . get_option( 'blogname' ) . '] ' . bbp_get_topic_title( $topic_id ), $reply_id, $topic_id, $user_id );
|
1038 |
if ( empty( $subject ) )
|
1039 |
continue;
|
1040 |
|
bbp-includes/bbp-core-compatibility.php
CHANGED
@@ -1520,15 +1520,15 @@ function bbp_pre_get_posts( $posts_query ) {
|
|
1520 |
|
1521 |
// Bail if $posts_query is not the main loop
|
1522 |
if ( $posts_query != $wp_the_query )
|
1523 |
-
return
|
1524 |
|
1525 |
-
// Bail if filters are suppressed on this query
|
1526 |
if ( true == $posts_query->get( 'suppress_filters' ) )
|
1527 |
-
return
|
1528 |
|
1529 |
// Bail if in admin
|
1530 |
if ( is_admin() )
|
1531 |
-
return
|
1532 |
|
1533 |
// Get query variables
|
1534 |
$bbp_user = $posts_query->get( $bbp->user_id );
|
@@ -1542,21 +1542,24 @@ function bbp_pre_get_posts( $posts_query ) {
|
|
1542 |
if ( !is_numeric( $bbp_user ) ) {
|
1543 |
|
1544 |
// Email was passed
|
1545 |
-
if ( is_email( $bbp_user ) )
|
1546 |
$bbp_user = get_user_by( 'email', $bbp_user );
|
|
|
1547 |
// Try nicename
|
1548 |
-
else
|
1549 |
$bbp_user = get_user_by( 'slug', $bbp_user );
|
|
|
1550 |
|
1551 |
// If we were successful, set to ID
|
1552 |
-
if ( is_object( $bbp_user ) )
|
1553 |
$bbp_user = $bbp_user->ID;
|
|
|
1554 |
}
|
1555 |
|
1556 |
// Create new user
|
1557 |
$user = new WP_User( $bbp_user );
|
1558 |
|
1559 |
-
//
|
1560 |
if ( !isset( $user ) || empty( $user ) || empty( $user->ID ) ) {
|
1561 |
$posts_query->set_404();
|
1562 |
return;
|
@@ -1568,19 +1571,22 @@ function bbp_pre_get_posts( $posts_query ) {
|
|
1568 |
if ( !empty( $is_edit ) ) {
|
1569 |
|
1570 |
// Only allow super admins on multisite to edit every user.
|
1571 |
-
if ( ( is_multisite() && !current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && !apply_filters( 'enable_edit_any_user_configuration', true ) ) || !current_user_can( 'edit_user', $user->ID ) )
|
1572 |
wp_die( __( 'You do not have the permission to edit this user.', 'bbpress' ) );
|
|
|
1573 |
|
1574 |
// We are editing a profile
|
1575 |
$posts_query->bbp_is_single_user_edit = true;
|
1576 |
|
1577 |
// Load the core WordPress contact methods
|
1578 |
-
if ( !function_exists( '_wp_get_user_contactmethods' ) )
|
1579 |
include_once( ABSPATH . 'wp-includes/registration.php' );
|
|
|
1580 |
|
1581 |
// Load the edit_user functions
|
1582 |
-
if ( !function_exists( 'edit_user' ) )
|
1583 |
require_once( ABSPATH . 'wp-admin/includes/user.php' );
|
|
|
1584 |
|
1585 |
// We are viewing a profile
|
1586 |
} else {
|
@@ -1597,8 +1603,9 @@ function bbp_pre_get_posts( $posts_query ) {
|
|
1597 |
$posts_query->set( 'bbp_user_id', $user->ID );
|
1598 |
|
1599 |
// Set author_name as current user's nicename to get correct posts
|
1600 |
-
if ( !bbp_is_query_name( 'bbp_widget' ) )
|
1601 |
$posts_query->set( 'author_name', $user->user_nicename );
|
|
|
1602 |
|
1603 |
// Set the displayed user global to this user
|
1604 |
$bbp->displayed_user = $user;
|
@@ -1609,7 +1616,7 @@ function bbp_pre_get_posts( $posts_query ) {
|
|
1609 |
// Check if the view exists by checking if there are query args are set
|
1610 |
$view_args = bbp_get_view_query_args( $bbp_view );
|
1611 |
|
1612 |
-
//
|
1613 |
if ( false === $view_args ) {
|
1614 |
$posts_query->set_404();
|
1615 |
return;
|
@@ -1625,16 +1632,17 @@ function bbp_pre_get_posts( $posts_query ) {
|
|
1625 |
} elseif ( !empty( $is_edit ) ) {
|
1626 |
|
1627 |
// We are editing a topic
|
1628 |
-
if ( $posts_query->get( 'post_type' ) == bbp_get_topic_post_type() )
|
1629 |
$posts_query->bbp_is_topic_edit = true;
|
1630 |
|
1631 |
// We are editing a reply
|
1632 |
-
elseif ( $posts_query->get( 'post_type' ) == bbp_get_reply_post_type() )
|
1633 |
$posts_query->bbp_is_reply_edit = true;
|
1634 |
|
1635 |
// We are editing a topic tag
|
1636 |
-
elseif ( bbp_is_topic_tag() )
|
1637 |
$posts_query->bbp_is_topic_tag_edit = true;
|
|
|
1638 |
|
1639 |
// We save post revisions on our own
|
1640 |
remove_action( 'pre_post_update', 'wp_save_post_revision' );
|
@@ -1649,12 +1657,14 @@ function bbp_pre_get_posts( $posts_query ) {
|
|
1649 |
$status[] = bbp_get_public_status_id();
|
1650 |
|
1651 |
// Add bbp_get_private_status_id() if user is capable
|
1652 |
-
if ( current_user_can( 'read_private_forums' ) )
|
1653 |
$status[] = bbp_get_private_status_id();
|
|
|
1654 |
|
1655 |
// Add bbp_get_hidden_status_id() if user is capable
|
1656 |
-
if ( current_user_can( 'read_hidden_forums' ) )
|
1657 |
$status[] = bbp_get_hidden_status_id();
|
|
|
1658 |
|
1659 |
// Implode and add the statuses
|
1660 |
$posts_query->set( 'post_status', implode( ',', $status ) );
|
@@ -1665,8 +1675,6 @@ function bbp_pre_get_posts( $posts_query ) {
|
|
1665 |
$posts_query->set( 'post_type', bbp_get_topic_post_type() );
|
1666 |
$posts_query->set( 'posts_per_page', get_option( '_bbp_topics_per_page', 15 ) );
|
1667 |
}
|
1668 |
-
|
1669 |
-
return $posts_query;
|
1670 |
}
|
1671 |
|
1672 |
?>
|
1520 |
|
1521 |
// Bail if $posts_query is not the main loop
|
1522 |
if ( $posts_query != $wp_the_query )
|
1523 |
+
return;
|
1524 |
|
1525 |
+
// Bail if filters are suppressed on this query
|
1526 |
if ( true == $posts_query->get( 'suppress_filters' ) )
|
1527 |
+
return;
|
1528 |
|
1529 |
// Bail if in admin
|
1530 |
if ( is_admin() )
|
1531 |
+
return;
|
1532 |
|
1533 |
// Get query variables
|
1534 |
$bbp_user = $posts_query->get( $bbp->user_id );
|
1542 |
if ( !is_numeric( $bbp_user ) ) {
|
1543 |
|
1544 |
// Email was passed
|
1545 |
+
if ( is_email( $bbp_user ) ) {
|
1546 |
$bbp_user = get_user_by( 'email', $bbp_user );
|
1547 |
+
|
1548 |
// Try nicename
|
1549 |
+
} else {
|
1550 |
$bbp_user = get_user_by( 'slug', $bbp_user );
|
1551 |
+
}
|
1552 |
|
1553 |
// If we were successful, set to ID
|
1554 |
+
if ( is_object( $bbp_user ) ) {
|
1555 |
$bbp_user = $bbp_user->ID;
|
1556 |
+
}
|
1557 |
}
|
1558 |
|
1559 |
// Create new user
|
1560 |
$user = new WP_User( $bbp_user );
|
1561 |
|
1562 |
+
// Bail if no user
|
1563 |
if ( !isset( $user ) || empty( $user ) || empty( $user->ID ) ) {
|
1564 |
$posts_query->set_404();
|
1565 |
return;
|
1571 |
if ( !empty( $is_edit ) ) {
|
1572 |
|
1573 |
// Only allow super admins on multisite to edit every user.
|
1574 |
+
if ( ( is_multisite() && !current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && !apply_filters( 'enable_edit_any_user_configuration', true ) ) || !current_user_can( 'edit_user', $user->ID ) ) {
|
1575 |
wp_die( __( 'You do not have the permission to edit this user.', 'bbpress' ) );
|
1576 |
+
}
|
1577 |
|
1578 |
// We are editing a profile
|
1579 |
$posts_query->bbp_is_single_user_edit = true;
|
1580 |
|
1581 |
// Load the core WordPress contact methods
|
1582 |
+
if ( !function_exists( '_wp_get_user_contactmethods' ) ) {
|
1583 |
include_once( ABSPATH . 'wp-includes/registration.php' );
|
1584 |
+
}
|
1585 |
|
1586 |
// Load the edit_user functions
|
1587 |
+
if ( !function_exists( 'edit_user' ) ) {
|
1588 |
require_once( ABSPATH . 'wp-admin/includes/user.php' );
|
1589 |
+
}
|
1590 |
|
1591 |
// We are viewing a profile
|
1592 |
} else {
|
1603 |
$posts_query->set( 'bbp_user_id', $user->ID );
|
1604 |
|
1605 |
// Set author_name as current user's nicename to get correct posts
|
1606 |
+
if ( !bbp_is_query_name( 'bbp_widget' ) ) {
|
1607 |
$posts_query->set( 'author_name', $user->user_nicename );
|
1608 |
+
}
|
1609 |
|
1610 |
// Set the displayed user global to this user
|
1611 |
$bbp->displayed_user = $user;
|
1616 |
// Check if the view exists by checking if there are query args are set
|
1617 |
$view_args = bbp_get_view_query_args( $bbp_view );
|
1618 |
|
1619 |
+
// Bail if view args is false (view isn't registered)
|
1620 |
if ( false === $view_args ) {
|
1621 |
$posts_query->set_404();
|
1622 |
return;
|
1632 |
} elseif ( !empty( $is_edit ) ) {
|
1633 |
|
1634 |
// We are editing a topic
|
1635 |
+
if ( $posts_query->get( 'post_type' ) == bbp_get_topic_post_type() ) {
|
1636 |
$posts_query->bbp_is_topic_edit = true;
|
1637 |
|
1638 |
// We are editing a reply
|
1639 |
+
} elseif ( $posts_query->get( 'post_type' ) == bbp_get_reply_post_type() ) {
|
1640 |
$posts_query->bbp_is_reply_edit = true;
|
1641 |
|
1642 |
// We are editing a topic tag
|
1643 |
+
} elseif ( bbp_is_topic_tag() ) {
|
1644 |
$posts_query->bbp_is_topic_tag_edit = true;
|
1645 |
+
}
|
1646 |
|
1647 |
// We save post revisions on our own
|
1648 |
remove_action( 'pre_post_update', 'wp_save_post_revision' );
|
1657 |
$status[] = bbp_get_public_status_id();
|
1658 |
|
1659 |
// Add bbp_get_private_status_id() if user is capable
|
1660 |
+
if ( current_user_can( 'read_private_forums' ) ) {
|
1661 |
$status[] = bbp_get_private_status_id();
|
1662 |
+
}
|
1663 |
|
1664 |
// Add bbp_get_hidden_status_id() if user is capable
|
1665 |
+
if ( current_user_can( 'read_hidden_forums' ) ) {
|
1666 |
$status[] = bbp_get_hidden_status_id();
|
1667 |
+
}
|
1668 |
|
1669 |
// Implode and add the statuses
|
1670 |
$posts_query->set( 'post_status', implode( ',', $status ) );
|
1675 |
$posts_query->set( 'post_type', bbp_get_topic_post_type() );
|
1676 |
$posts_query->set( 'posts_per_page', get_option( '_bbp_topics_per_page', 15 ) );
|
1677 |
}
|
|
|
|
|
1678 |
}
|
1679 |
|
1680 |
?>
|
bbp-includes/bbp-core-hooks.php
CHANGED
@@ -196,7 +196,7 @@ add_action( 'bbp_delete_topic', 'bbp_remove_topic_from_all_favorites' );
|
|
196 |
add_action( 'template_redirect', 'bbp_subscriptions_handler', 1 );
|
197 |
add_action( 'bbp_trash_topic', 'bbp_remove_topic_from_all_subscriptions' );
|
198 |
add_action( 'bbp_delete_topic', 'bbp_remove_topic_from_all_subscriptions' );
|
199 |
-
add_action( 'bbp_new_reply', 'bbp_notify_subscribers', 1,
|
200 |
|
201 |
// Sticky
|
202 |
add_action( 'bbp_trash_topic', 'bbp_unstick_topic' );
|
196 |
add_action( 'template_redirect', 'bbp_subscriptions_handler', 1 );
|
197 |
add_action( 'bbp_trash_topic', 'bbp_remove_topic_from_all_subscriptions' );
|
198 |
add_action( 'bbp_delete_topic', 'bbp_remove_topic_from_all_subscriptions' );
|
199 |
+
add_action( 'bbp_new_reply', 'bbp_notify_subscribers', 1, 5 );
|
200 |
|
201 |
// Sticky
|
202 |
add_action( 'bbp_trash_topic', 'bbp_unstick_topic' );
|
bbp-includes/bbp-forum-functions.php
CHANGED
@@ -924,46 +924,46 @@ function bbp_pre_get_posts_exclude_forums( $posts_query ) {
|
|
924 |
|
925 |
// Bail if all forums are explicitly allowed
|
926 |
if ( true === apply_filters( 'bbp_include_all_forums', $posts_query ) )
|
927 |
-
return
|
928 |
|
929 |
// Bail if $posts_query is not an object or of incorrect class
|
930 |
if ( !is_object( $posts_query ) || ( 'WP_Query' != get_class( $posts_query ) ) )
|
931 |
-
return
|
932 |
|
933 |
// Bail if filters are suppressed on this query
|
934 |
if ( true == $posts_query->get( 'suppress_filters' ) )
|
935 |
-
return
|
936 |
|
937 |
-
//
|
938 |
-
|
939 |
|
940 |
-
//
|
941 |
-
|
942 |
|
943 |
-
|
944 |
-
|
945 |
|
946 |
-
|
947 |
-
|
948 |
|
949 |
-
//
|
950 |
-
|
951 |
|
952 |
-
|
953 |
-
|
|
|
954 |
|
955 |
-
|
956 |
-
|
957 |
|
958 |
-
|
959 |
-
|
960 |
|
961 |
-
|
962 |
-
|
963 |
-
}
|
964 |
|
965 |
-
|
966 |
-
|
967 |
}
|
968 |
|
969 |
/**
|
924 |
|
925 |
// Bail if all forums are explicitly allowed
|
926 |
if ( true === apply_filters( 'bbp_include_all_forums', $posts_query ) )
|
927 |
+
return;
|
928 |
|
929 |
// Bail if $posts_query is not an object or of incorrect class
|
930 |
if ( !is_object( $posts_query ) || ( 'WP_Query' != get_class( $posts_query ) ) )
|
931 |
+
return;
|
932 |
|
933 |
// Bail if filters are suppressed on this query
|
934 |
if ( true == $posts_query->get( 'suppress_filters' ) )
|
935 |
+
return;
|
936 |
|
937 |
+
// Only exclude forums on bbPress queries
|
938 |
+
switch ( $posts_query->get( 'post_type' ) ) {
|
939 |
|
940 |
+
// Topics
|
941 |
+
case bbp_get_topic_post_type() :
|
942 |
|
943 |
+
// Replies
|
944 |
+
case bbp_get_reply_post_type() :
|
945 |
|
946 |
+
// Topics and replies
|
947 |
+
case array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) :
|
948 |
|
949 |
+
// Get forums to exclude
|
950 |
+
$forum_ids = bbp_exclude_forum_ids( 'meta_query' );
|
951 |
|
952 |
+
// Bail if no forums to exclude
|
953 |
+
if ( empty( $forum_ids ) )
|
954 |
+
return;
|
955 |
|
956 |
+
// Get any existing meta queries
|
957 |
+
$meta_query = $posts_query->get( 'meta_query' );
|
958 |
|
959 |
+
// Add our meta query to existing
|
960 |
+
$meta_query[] = $forum_ids;
|
961 |
|
962 |
+
// Set the meta_query var
|
963 |
+
$posts_query->set( 'meta_query', $meta_query );
|
|
|
964 |
|
965 |
+
break;
|
966 |
+
}
|
967 |
}
|
968 |
|
969 |
/**
|
bbp-themes/bbp-twentyten/functions.php
CHANGED
@@ -63,7 +63,7 @@ class BBP_Twenty_Ten extends BBP_Theme_Compat {
|
|
63 |
$this->name = 'bbPress (Twenty Ten)';
|
64 |
|
65 |
// Version of theme in YYYMMDD format
|
66 |
-
$this->version = '
|
67 |
|
68 |
// Setup the theme path
|
69 |
$this->dir = $bbp->themes_dir . '/bbp-twentyten';
|
63 |
$this->name = 'bbPress (Twenty Ten)';
|
64 |
|
65 |
// Version of theme in YYYMMDD format
|
66 |
+
$this->version = '20110921';
|
67 |
|
68 |
// Setup the theme path
|
69 |
$this->dir = $bbp->themes_dir . '/bbp-twentyten';
|
bbp-themes/bbp-twentyten/single-reply-edit.php
CHANGED
@@ -14,7 +14,7 @@
|
|
14 |
<div id="container">
|
15 |
<div id="content" role="main">
|
16 |
|
17 |
-
<?php while ( have_posts() ) the_post(); ?>
|
18 |
|
19 |
<div id="bbp-edit-page" class="bbp-edit-page">
|
20 |
<h1 class="entry-title"><?php the_title(); ?></h1>
|
@@ -25,6 +25,8 @@
|
|
25 |
</div>
|
26 |
</div><!-- #bbp-edit-page -->
|
27 |
|
|
|
|
|
28 |
</div><!-- #content -->
|
29 |
</div><!-- #container -->
|
30 |
|
14 |
<div id="container">
|
15 |
<div id="content" role="main">
|
16 |
|
17 |
+
<?php while ( have_posts() ) : the_post(); ?>
|
18 |
|
19 |
<div id="bbp-edit-page" class="bbp-edit-page">
|
20 |
<h1 class="entry-title"><?php the_title(); ?></h1>
|
25 |
</div>
|
26 |
</div><!-- #bbp-edit-page -->
|
27 |
|
28 |
+
<?php endwhile; ?>
|
29 |
+
|
30 |
</div><!-- #content -->
|
31 |
</div><!-- #container -->
|
32 |
|
bbp-themes/bbp-twentyten/single-topic-edit.php
CHANGED
@@ -14,7 +14,7 @@
|
|
14 |
<div id="container">
|
15 |
<div id="content" role="main">
|
16 |
|
17 |
-
<?php while ( have_posts() ) the_post(); ?>
|
18 |
|
19 |
<div id="bbp-edit-page" class="bbp-edit-page">
|
20 |
<h1 class="entry-title"><?php the_title(); ?></h1>
|
@@ -25,6 +25,8 @@
|
|
25 |
</div>
|
26 |
</div><!-- #bbp-edit-page -->
|
27 |
|
|
|
|
|
28 |
</div><!-- #content -->
|
29 |
</div><!-- #container -->
|
30 |
|
14 |
<div id="container">
|
15 |
<div id="content" role="main">
|
16 |
|
17 |
+
<?php while ( have_posts() ) : the_post(); ?>
|
18 |
|
19 |
<div id="bbp-edit-page" class="bbp-edit-page">
|
20 |
<h1 class="entry-title"><?php the_title(); ?></h1>
|
25 |
</div>
|
26 |
</div><!-- #bbp-edit-page -->
|
27 |
|
28 |
+
<?php endwhile; ?>
|
29 |
+
|
30 |
</div><!-- #content -->
|
31 |
</div><!-- #container -->
|
32 |
|
bbpress.php
CHANGED
@@ -15,7 +15,7 @@
|
|
15 |
* Description: bbPress is forum software with a twist from the creators of WordPress.
|
16 |
* Author: The bbPress Community
|
17 |
* Author URI: http://bbpress.org
|
18 |
-
* Version: 2.0
|
19 |
* Text Domain: bbpress
|
20 |
* Domain Path: /bbp-languages/
|
21 |
*/
|
@@ -48,12 +48,12 @@ class bbPress {
|
|
48 |
/**
|
49 |
* @public string bbPress version
|
50 |
*/
|
51 |
-
public $version = '2.0
|
52 |
|
53 |
/**
|
54 |
* @public string bbPress DB version
|
55 |
*/
|
56 |
-
public $db_version = '
|
57 |
|
58 |
/** Post types ************************************************************/
|
59 |
|
15 |
* Description: bbPress is forum software with a twist from the creators of WordPress.
|
16 |
* Author: The bbPress Community
|
17 |
* Author URI: http://bbpress.org
|
18 |
+
* Version: 2.0
|
19 |
* Text Domain: bbpress
|
20 |
* Domain Path: /bbp-languages/
|
21 |
*/
|
48 |
/**
|
49 |
* @public string bbPress version
|
50 |
*/
|
51 |
+
public $version = '2.0';
|
52 |
|
53 |
/**
|
54 |
* @public string bbPress DB version
|
55 |
*/
|
56 |
+
public $db_version = '200';
|
57 |
|
58 |
/** Post types ************************************************************/
|
59 |
|
readme.txt
CHANGED
@@ -3,7 +3,7 @@ Contributors: matt, johnjamesjacoby
|
|
3 |
Tags: bbpress, forums, discussion, support, theme, buddypress, akismet, multisite
|
4 |
Requires at least: 3.2.1
|
5 |
Tested up to: 3.2.1
|
6 |
-
Stable tag: 2.0
|
7 |
|
8 |
bbPress is forum software with a twist from the creators of WordPress
|
9 |
|
@@ -22,8 +22,20 @@ We're keeping things as small and light as possible while still allowing for gre
|
|
22 |
5. View your site.
|
23 |
6. Adjust the CSS of your theme as needed, to make everything pretty.
|
24 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
25 |
== Changelog ==
|
26 |
|
|
|
|
|
|
|
27 |
= 2.0-rc-5 =
|
28 |
* Fixed Genesis incompatibilities
|
29 |
* Fixed BuddyPress activity stream issues
|
3 |
Tags: bbpress, forums, discussion, support, theme, buddypress, akismet, multisite
|
4 |
Requires at least: 3.2.1
|
5 |
Tested up to: 3.2.1
|
6 |
+
Stable tag: 2.0
|
7 |
|
8 |
bbPress is forum software with a twist from the creators of WordPress
|
9 |
|
22 |
5. View your site.
|
23 |
6. Adjust the CSS of your theme as needed, to make everything pretty.
|
24 |
|
25 |
+
== Screenshots ==
|
26 |
+
1. Forums - Admin Interface
|
27 |
+
2. Topics - Admin Interface
|
28 |
+
3. Replies - Admin Interface
|
29 |
+
4. Settings 1 - Admin Interface
|
30 |
+
5. Settings 2 - Admin Interface
|
31 |
+
6. Themes - Admin Interface
|
32 |
+
7. Single Forum - Default Theme
|
33 |
+
|
34 |
== Changelog ==
|
35 |
|
36 |
+
= 2.0 =
|
37 |
+
* Released on September 21, 2011
|
38 |
+
|
39 |
= 2.0-rc-5 =
|
40 |
* Fixed Genesis incompatibilities
|
41 |
* Fixed BuddyPress activity stream issues
|
screenshot-1.png
ADDED
Binary file
|
screenshot-2.png
ADDED
Binary file
|
screenshot-3.png
ADDED
Binary file
|
screenshot-4.png
ADDED
Binary file
|
screenshot-5.png
ADDED
Binary file
|
screenshot-6.png
ADDED
Binary file
|
screenshot-7.png
ADDED
Binary file
|