Changeset 3347684

Timestamp:

08/20/2025 05:41:10 PM (4 months ago)

Author:

boonebgorges

Message:

Create tag 2.2.6.

Location:

buddypress-docs

Files:

• tags/2.2.6 (copied) (copied from buddypress-docs/trunk)
• tags/2.2.6/includes/access-query.php (modified) (1 diff)
• tags/2.2.6/includes/component.php (modified) (1 diff)
• tags/2.2.6/includes/integration-groups.php (modified) (1 diff)
• tags/2.2.6/loader.php (modified) (2 diffs)
• tags/2.2.6/readme.txt (modified) (2 diffs)
• trunk/includes/access-query.php (modified) (1 diff)
• trunk/includes/component.php (modified) (1 diff)
• trunk/includes/integration-groups.php (modified) (1 diff)
• trunk/loader.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)

buddypress-docs/tags/2.2.6/includes/access-query.php

@@ -321 +321 @@
     // results, so we check the post type, and bail if the post_type rules
     // out Docs to begin with
+    $docs_post_type    = bp_docs_get_post_type_name();
     $queried_post_type = $query->get( 'post_type' );
-    $pt = bp_docs_get_post_type_name();
-    $is_bp_doc_query = is_array( $queried_post_type ) ? in_array( $pt, $queried_post_type ) : $pt == $queried_post_type;
+
+    $is_bp_doc_post_type = is_array( $queried_post_type ) ? in_array( $docs_post_type, $queried_post_type ) : $docs_post_type === $queried_post_type;
+
+    $docs_tag_tax      = apply_filters( 'bp_docs_docs_tag_tax_name', 'bp_docs_tag' );
+    $queried_tax_query = $query->get( 'tax_query' );
 
     $filter_query = false;
 
-    // 'pagename' queries always fetch pages.
-    if ( ! $queried_post_type && ! $query->get( 'pagename' ) ) {
+    if ( 'any' === $queried_post_type ) {
         $filter_query = true;
-    } elseif ( 'any' === $queried_post_type ) {
+    } elseif ( $is_bp_doc_post_type ) {
         $filter_query = true;
-    } elseif ( $is_bp_doc_query ) {
-        $filter_query = true;
-    }
-
-    if ( $filter_query ) {
-        $bp_docs_access_query = bp_docs_access_query();
-
-        if ( $pt == $queried_post_type ) {
-            // Use a tax query if possible
-            $tax_query = $query->get( 'tax_query' );
-            if ( ! $tax_query ) {
-                $tax_query = array();
-            }
-
-            $query->set( 'tax_query', array_merge( $tax_query, $bp_docs_access_query->get_tax_query() ) );
-
-        } else {
-            // When it's not a straight bp_doc query, a tax_query
-            // approach won't work (because the taxonomy in
-            // question only applies to bp_docs, and conditional
-            // tax_query is not supported by WP). Instead, get a
-            // list of off-limits Docs and pass to post__not_in
-            $exclude = $bp_docs_access_query->get_doc_ids();
-
-            if ( ! empty( $exclude ) ) {
-                $not_in = $query->get( 'post__not_in' );
-                $query->set( 'post__not_in', array_merge( (array) $not_in, $exclude ) );
-            }
-
+    } elseif ( $queried_tax_query ) {
+        foreach ( $queried_tax_query as $tax_query ) {
+            if ( ! empty( $tax_query['taxonomy'] ) && $docs_tag_tax === $tax_query['taxonomy'] ) {
+                $filter_query = true;
+                break;
+            }
+        }
+    }
+
+    if ( ! $filter_query ) {
+        return;
+    }
+
+    $bp_docs_access_query = bp_docs_access_query();
+
+    if ( $docs_post_type == $queried_post_type ) {
+        // Use a tax query if possible
+        $tax_query = $query->get( 'tax_query' );
+        if ( ! $tax_query ) {
+            $tax_query = array();
+        }
+
+        $query->set( 'tax_query', array_merge( $tax_query, $bp_docs_access_query->get_tax_query() ) );
+
+    } else {
+        // When it's not a straight bp_doc query, a tax_query
+        // approach won't work (because the taxonomy in
+        // question only applies to bp_docs, and conditional
+        // tax_query is not supported by WP). Instead, get a
+        // list of off-limits Docs and pass to post__not_in
+        $exclude = $bp_docs_access_query->get_doc_ids();
+
+        if ( ! empty( $exclude ) ) {
+            $not_in = $query->get( 'post__not_in' );
+            $query->set( 'post__not_in', array_merge( (array) $not_in, $exclude ) );
         }
     }

buddypress-docs/tags/2.2.6/includes/component.php

@@ -103 +103 @@
         parent::start(
             'bp_docs',
-            __( 'BuddyPress Docs', 'buddypress-docs' ),
+            'BuddyPress Docs',
             BP_DOCS_INSTALL_PATH
         );

buddypress-docs/tags/2.2.6/includes/integration-groups.php

@@ -1292 +1292 @@
             }
 
-            if ( $settings_are_changed ) {
-                // No need to resave settings if they're the same
+            $success = false;
+            if ( ! $settings_are_changed ) {
                 $success = true;
             } elseif ( groups_update_groupmeta( $group_id, 'bp-docs', $settings ) ) {

buddypress-docs/tags/2.2.6/loader.php

@@ -4 +4 @@
 Plugin URI: http://github.com/boonebgorges/buddypress-docs
 Description: Adds collaborative Docs to BuddyPress
-Version: 2.2.5
+Version: 2.2.6
 Author: Boone B Gorges, David Cavins
 Author URI: http://boone.gorg.es
@@ -16 +16 @@
 */
 
-define( 'BP_DOCS_VERSION', '2.2.5' );
+define( 'BP_DOCS_VERSION', '2.2.6' );
 
 require_once __DIR__ . '/vendor/autoload.php';

buddypress-docs/tags/2.2.6/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 6.8
-Stable tag: 2.2.5
+Stable tag: 2.2.6
 
 Adds collaborative Docs to BuddyPress.
@@ -33 +33 @@
 
 == Changelog ==
+
+= 2.2.6 =
+* Changed the logic for access-protection, so that the off-limits Docs query is run far less frequently. This helps with performance as well as with global pollution.
+* Fixed the logic for saving group settings.
+* Improve compatibility with recent versions of WordPress and BuddyPress when loading the BP_Component.
 
 = 2.2.5 =

buddypress-docs/trunk/includes/access-query.php

@@ -321 +321 @@
     // results, so we check the post type, and bail if the post_type rules
     // out Docs to begin with
+    $docs_post_type    = bp_docs_get_post_type_name();
     $queried_post_type = $query->get( 'post_type' );
-    $pt = bp_docs_get_post_type_name();
-    $is_bp_doc_query = is_array( $queried_post_type ) ? in_array( $pt, $queried_post_type ) : $pt == $queried_post_type;
+
+    $is_bp_doc_post_type = is_array( $queried_post_type ) ? in_array( $docs_post_type, $queried_post_type ) : $docs_post_type === $queried_post_type;
+
+    $docs_tag_tax      = apply_filters( 'bp_docs_docs_tag_tax_name', 'bp_docs_tag' );
+    $queried_tax_query = $query->get( 'tax_query' );
 
     $filter_query = false;
 
-    // 'pagename' queries always fetch pages.
-    if ( ! $queried_post_type && ! $query->get( 'pagename' ) ) {
+    if ( 'any' === $queried_post_type ) {
         $filter_query = true;
-    } elseif ( 'any' === $queried_post_type ) {
+    } elseif ( $is_bp_doc_post_type ) {
         $filter_query = true;
-    } elseif ( $is_bp_doc_query ) {
-        $filter_query = true;
-    }
-
-    if ( $filter_query ) {
-        $bp_docs_access_query = bp_docs_access_query();
-
-        if ( $pt == $queried_post_type ) {
-            // Use a tax query if possible
-            $tax_query = $query->get( 'tax_query' );
-            if ( ! $tax_query ) {
-                $tax_query = array();
-            }
-
-            $query->set( 'tax_query', array_merge( $tax_query, $bp_docs_access_query->get_tax_query() ) );
-
-        } else {
-            // When it's not a straight bp_doc query, a tax_query
-            // approach won't work (because the taxonomy in
-            // question only applies to bp_docs, and conditional
-            // tax_query is not supported by WP). Instead, get a
-            // list of off-limits Docs and pass to post__not_in
-            $exclude = $bp_docs_access_query->get_doc_ids();
-
-            if ( ! empty( $exclude ) ) {
-                $not_in = $query->get( 'post__not_in' );
-                $query->set( 'post__not_in', array_merge( (array) $not_in, $exclude ) );
-            }
-
+    } elseif ( $queried_tax_query ) {
+        foreach ( $queried_tax_query as $tax_query ) {
+            if ( ! empty( $tax_query['taxonomy'] ) && $docs_tag_tax === $tax_query['taxonomy'] ) {
+                $filter_query = true;
+                break;
+            }
+        }
+    }
+
+    if ( ! $filter_query ) {
+        return;
+    }
+
+    $bp_docs_access_query = bp_docs_access_query();
+
+    if ( $docs_post_type == $queried_post_type ) {
+        // Use a tax query if possible
+        $tax_query = $query->get( 'tax_query' );
+        if ( ! $tax_query ) {
+            $tax_query = array();
+        }
+
+        $query->set( 'tax_query', array_merge( $tax_query, $bp_docs_access_query->get_tax_query() ) );
+
+    } else {
+        // When it's not a straight bp_doc query, a tax_query
+        // approach won't work (because the taxonomy in
+        // question only applies to bp_docs, and conditional
+        // tax_query is not supported by WP). Instead, get a
+        // list of off-limits Docs and pass to post__not_in
+        $exclude = $bp_docs_access_query->get_doc_ids();
+
+        if ( ! empty( $exclude ) ) {
+            $not_in = $query->get( 'post__not_in' );
+            $query->set( 'post__not_in', array_merge( (array) $not_in, $exclude ) );
         }
     }

buddypress-docs/trunk/includes/component.php

@@ -103 +103 @@
         parent::start(
             'bp_docs',
-            __( 'BuddyPress Docs', 'buddypress-docs' ),
+            'BuddyPress Docs',
             BP_DOCS_INSTALL_PATH
         );

buddypress-docs/trunk/includes/integration-groups.php

@@ -1292 +1292 @@
             }
 
-            if ( $settings_are_changed ) {
-                // No need to resave settings if they're the same
+            $success = false;
+            if ( ! $settings_are_changed ) {
                 $success = true;
             } elseif ( groups_update_groupmeta( $group_id, 'bp-docs', $settings ) ) {

buddypress-docs/trunk/loader.php

@@ -4 +4 @@
 Plugin URI: http://github.com/boonebgorges/buddypress-docs
 Description: Adds collaborative Docs to BuddyPress
-Version: 2.2.5
+Version: 2.2.6
 Author: Boone B Gorges, David Cavins
 Author URI: http://boone.gorg.es
@@ -16 +16 @@
 */
 
-define( 'BP_DOCS_VERSION', '2.2.5' );
+define( 'BP_DOCS_VERSION', '2.2.6' );
 
 require_once __DIR__ . '/vendor/autoload.php';

buddypress-docs/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 6.8
-Stable tag: 2.2.5
+Stable tag: 2.2.6
 
 Adds collaborative Docs to BuddyPress.
@@ -33 +33 @@
 
 == Changelog ==
+
+= 2.2.6 =
+* Changed the logic for access-protection, so that the off-limits Docs query is run far less frequently. This helps with performance as well as with global pollution.
+* Fixed the logic for saving group settings.
+* Improve compatibility with recent versions of WordPress and BuddyPress when loading the BP_Component.
 
 = 2.2.5 =