Changeset 11771

Timestamp:

12/12/2017 03:07:29 PM (7 years ago)

Author:

djpaul

Message:

2.9 branch - fix Classic Forums compatibility with WordPress 4.7+.

• Fixes the fatal error when using WP 4.7+.
• Fixes issues with installing the old bbPress DB tables with utf8mb4, as of WP 4.2+.
• When installing the old bbPress DB tables, do not attempt to modify the wp_users DB table.
• Fixes the topic title not displaying in newer themes using document title in WP 4.4+.
• Adds a performance tweak when bp_get_forum_topic_posts() is used more than once on the same forum topic page.

Props r-a-y

Fixes #7502

Location:

branches/2.9/src/bp-forums

Files:

• bp-forums-bbpress-sa.php (modified) (3 diffs)
• bp-forums-filters.php (modified) (1 diff)
• bp-forums-template.php (modified) (1 diff)
• class.backpress-taxonomy.php (added)
• class.bb-taxonomy.php (added)

branches/2.9/src/bp-forums/bp-forums-bbpress-sa.php

@@ -38 +38 @@
 
     require( BB_PATH . BB_INC . 'class.bb-query.php' );
-    require( BB_PATH . BB_INC . 'class.bb-walker.php' );
+    @require( BB_PATH . BB_INC . 'class.bb-walker.php' );
 
     require( BB_PATH . BB_INC . 'functions.bb-core.php' );
@@ -51 +51 @@
     require( BB_PATH . BB_INC . 'functions.bb-template.php' );
 
-    require( BACKPRESS_PATH . 'class.wp-taxonomy.php' );
-    require( BB_PATH . BB_INC . 'class.bb-taxonomy.php' );
-
-    require( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
+    require( $bp->plugin_dir . '/bp-forums/class.backpress-taxonomy.php' );
+    require( $bp->plugin_dir . '/bp-forums/class.bb-taxonomy.php' );
+
+    @require( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
 
     $bb = new stdClass();
@@ -125 +125 @@
     // Check if the tables are installed, if not, install them.
     if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) ) {
+        // Do not alter wp_users table.
+        if ( ! defined( 'BB_SCHEMA_IGNORE_WP_USERS_TABLES' ) ) {
+            define( 'BB_SCHEMA_IGNORE_WP_USERS_TABLES', true );
+        }
+
         require( BB_PATH . 'bb-admin/includes/defaults.bb-schema.php' );
 
         // Backticks and "IF NOT EXISTS" break the dbDelta function.
-        bp_bb_dbDelta( str_replace( ' IF NOT EXISTS', '', str_replace( '`', '', $bb_queries ) ) );
-
+        $bb_queries = str_replace( ' IF NOT EXISTS', '', str_replace( '`', '', $bb_queries ) );
+
+        // Fix issue with utf8mb4 in WP 4.2+ and bbPress DB schema (bb_terms/bb_meta)
+        $bb_queries = str_replace( array( 'varchar(200)', 'varchar(255)' ), 'varchar(191)', $bb_queries );
+
+        // Do the DB!
+        bp_bb_dbDelta( $bb_queries );
         require( BB_PATH . 'bb-admin/includes/functions.bb-upgrade.php' );
         bb_update_db_version();

branches/2.9/src/bp-forums/bp-forums-filters.php

@@ -170 +170 @@
 
 /**
+ * Append forum topic to document title.
+ *
+ * @since 2.9.0
+ *
+ * @param array $bp_title The BuddyPress page title parts.
+ * @param array $title    The original WordPress title parts.
+ */
+function bp_forums_add_forum_topic_to_document_title( $bp_title, $title ) {
+    if ( bp_is_current_action( 'forum' ) && bp_is_action_variable( 'topic', 0 ) && bp_has_forum_topic_posts() ) {
+        /** This filter is documented in wp-includes/general-template.php */
+        $sep = apply_filters( 'document_title_separator', '-' );
+
+        $bp_title['title'] = bp_get_the_topic_title() . " $sep " . $bp_title['title'];
+    }
+
+    return $bp_title;
+}
+add_filter( 'bp_modify_document_title_parts', 'bp_forums_add_forum_topic_to_document_title', 10, 2 );
+
+/**
  * Remove the anchor tag autogenerated for at-mentions when forum topics and posts are edited.
  *

branches/2.9/src/bp-forums/bp-forums-template.php

@@ -2426 +2426 @@
 
     } else {
-        $topic_template = new BP_Forums_Template_Topic( (int) $topic_id, $per_page, $max, $order );
+        if ( empty( $topic_template ) ) {
+            $topic_template = new BP_Forums_Template_Topic( (int) $topic_id, $per_page, $max, $order );
+        }
 
         // Current topic forum_id needs to match current_group forum_id.