Changeset 6934

Timestamp:

11/12/2019 05:12:14 PM (5 years ago)

Author:

johnjamesjacoby

Message:

Tools: allow repairs to also be pending.

This commit makes Repairs work like Upgrades, allowing for repair tools to also be pending. It adds a $type parameter to a few functions to allow grouping or separating, depending on the count context.

See #3052.

Location:

trunk/src/includes

Files:

• admin/tools.php (modified) (2 diffs)
• admin/tools/common.php (modified) (2 diffs)
• admin/tools/repair.php (modified) (1 diff)
• core/update.php (modified) (3 diffs)

trunk/src/includes/admin/tools.php

@@ -521 +521 @@
             'func' => 'bbp_admin_repair_page',
             'cap'  => 'bbp_tools_repair_page',
-            'name' => esc_html__( 'Repair Forums', 'bbpress' ),
+            'name' => bbp_maybe_append_pending_upgrade_count( esc_html__( 'Repair Forums', 'bbpress' ), 'repair' ),
 
             // Deprecated 2.6.0
@@ -530 +530 @@
             'func' => 'bbp_admin_upgrade_page',
             'cap'  => 'bbp_tools_upgrade_page',
-            'name' => bbp_maybe_append_pending_upgrade_count( esc_html__( 'Upgrade Forums', 'bbpress' ) ),
+            'name' => bbp_maybe_append_pending_upgrade_count( esc_html__( 'Upgrade Forums', 'bbpress' ), 'upgrade' ),
 
             // Deprecated 2.6.0

trunk/src/includes/admin/tools/common.php

@@ -881 +881 @@
     }
 
+    // Get the type of tool
+    $type = bbp_get_admin_repair_tool_page_id();
+
     // Count the tools
-    $tools = bbp_get_admin_repair_tools( bbp_get_admin_repair_tool_page_id() );
+    $tools = bbp_get_admin_repair_tools( $type );
 
     // Get the tools URL
@@ -888 +891 @@
 
     // Get pending upgrades
-    $pending = bbp_get_pending_upgrades();
+    $pending = bbp_get_pending_upgrades( $type );
 
     // Get the current status, if any

trunk/src/includes/admin/tools/repair.php

@@ -48 +48 @@
         <p class="description"><?php esc_html_e( 'Some of these tools create substantial database overhead. Use caution when running more than 1 repair at a time.', 'bbpress' ); ?></p>
 
-        <?php bbp_admin_repair_tool_overhead_filters(); ?>
+        <?php bbp_admin_repair_tool_status_filters(); ?>
 
         <form class="settings" method="get" action="">

trunk/src/includes/core/update.php

@@ -501 +501 @@
  * @since 2.6.0 bbPress (r6895)
  *
+ * @param string $type Type of pending upgrades (upgrade|repair|empty)
+ *
  * @return int
  */
-function bbp_get_pending_upgrade_count() {
-    return count( (array) bbp_get_pending_upgrades() );
+function bbp_get_pending_upgrade_count( $type = '' ) {
+    return count( (array) bbp_get_pending_upgrades( $type ) );
 }
 
@@ -512 +514 @@
  * @since 2.6.0 bbPress (r6895)
  *
+ * @param string $type Type of pending upgrades (upgrade|repair|empty)
+ *
  * @return array
  */
-function bbp_get_pending_upgrades() {
-    return (array) get_option( '_bbp_db_pending_upgrades', array() );
+function bbp_get_pending_upgrades( $type = '' ) {
+
+    // Get the pending upgrades
+    $retval = (array) get_option( '_bbp_db_pending_upgrades', array() );
+
+    // Looking for a specific type?
+    if ( ! empty( $type ) ) {
+        $tools   = bbp_get_admin_repair_tools( $type );
+        $plucked = array_keys( wp_list_pluck( $tools, 'type' ) );
+        $retval  = array_intersect( $retval, $plucked );
+    }
+
+    return (array) $retval;
 }
 
@@ -577 +592 @@
  * @since 2.6.0 bbPress (r6896)
  *
- * @param string $string
+ * @param string $string Text to append count to
+ * @param string $type   Type of pending upgrades (upgrade|repair|empty)
  *
  * @return string
  */
-function bbp_maybe_append_pending_upgrade_count( $string = '' ) {
+function bbp_maybe_append_pending_upgrade_count( $string = '', $type = '' ) {
 
     // Look for an upgrade count
-    $count = bbp_get_pending_upgrade_count();
+    $count = bbp_get_pending_upgrade_count( $type );
 
     // Append the count to the string