Changeset 6705

Timestamp:

09/14/2017 10:57:06 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Admin: add an admin notice if database upgrade was skipped.

This change adds a persistent admin notice (who doesn't love those?) in the event that the forums are part of a large WordPress installation that prevented the automatic database upgrade routine from running.

Two links are provided: one to "Go Upgrade" and another to "Hide Forever". The first will take the user (with adequate capability) to the Tools > Forums > Upgrade screen; the second will delete the notice nag key from wp_options.

This includes some admin area CSS tweaks, so the asset version gets a bump as well.

Location:

trunk/src

Files:

• bbpress.php (modified) (1 diff)
• includes/admin/assets/css/admin.css (modified) (1 diff)
• includes/admin/classes/class-bbp-admin.php (modified) (2 diffs)
• includes/core/options.php (modified) (1 diff)
• includes/core/update.php (modified) (3 diffs)

trunk/src/bbpress.php

@@ -204 +204 @@
         /** Versions **********************************************************/
 
-        $this->version    = '2.6-rc-6698';
+        $this->version    = '2.6-rc-6701';
         $this->db_version = '262';
 

trunk/src/includes/admin/assets/css/admin.css

@@ -42 +42 @@
 .bbp-hive:before {
     content: "\f449";
+}
+
+.notice-bbpress {
+    border-left: 4px solid #78cd95;
+    padding-left: 36px;
+    background-color: rgb(235, 255, 235);
+    position: relative;
+}
+
+.notice-bbpress .bbpress-logo-icon {
+    position: absolute;
+    height: auto;
+    width: auto;
+    padding: 7px 9px;
+    top: 50%;
+    left: 0;
+    transform: translateY(-50%);
+    font: 400 24px/1 dashicons !important;
+}
+
+.notice-bbpress .bbpress-logo-icon:before {
+    content: "\f477";
+    color: #555;
 }
 

trunk/src/includes/admin/classes/class-bbp-admin.php

@@ -150 +150 @@
         /** General Actions ***************************************************/
 
+        add_action( 'bbp_admin_init',              array( $this, 'setup_notices'           ) );
+        add_action( 'bbp_admin_init',              array( $this, 'hide_notices'            ) );
         add_action( 'bbp_admin_menu',              array( $this, 'admin_menus'             ) ); // Add menu item to settings menu
         add_action( 'bbp_admin_head',              array( $this, 'admin_head'              ) ); // Add some general styling to the admin area
@@ -185 +187 @@
         // Allow plugins to modify these actions
         do_action_ref_array( 'bbp_admin_loaded', array( &$this ) );
+    }
+
+    /**
+     * Setup general admin area notices.
+     *
+     * @since 2.6.0 bbPress (r6701)
+     */
+    public function setup_notices() {
+
+        // Database upgrade skipped?
+        $skipped = get_option( '_bbp_db_upgrade_skipped', 0 );
+
+        // Database upgrade skipped!
+        if ( ! empty( $skipped ) && ( $skipped < 260 ) && current_user_can( 'bbp_tools_upgrade_page' ) ) {
+
+            // Link to upgrade page
+            $upgrade_url  = add_query_arg( array( 'page' => 'bbp-upgrade' ), admin_url( 'tools.php' ) );
+            $dismiss_url  = wp_nonce_url( add_query_arg( array( 'bbp-hide-notice' => 'bbp-skip-upgrade' ) ), 'bbp-hide-notice' );
+            $upgrade_link = '<a href="' . esc_url( $upgrade_url ) . '">' . esc_html__( 'Go Upgrade',   'bbpress' ) . '</a>';
+            $dismiss_link = '<a href="' . esc_url( $dismiss_url ) . '">' . esc_html__( 'Hide Forever', 'bbpress' ) . '</a>';
+            $bbp_dashicon = '<span class="bbpress-logo-icon"></span>';
+            $message      = $bbp_dashicon . sprintf(
+                esc_html__( 'bbPress requires a manual database upgrade. %s or %s', 'bbpress' ),
+                $upgrade_link,
+                $dismiss_link
+            );
+
+            // Add tools feedback
+            bbp_admin_tools_feedback( $message, 'notice-bbpress', false );
+        }
+    }
+
+    /**
+     * Handle hiding of general admin area notices.
+     *
+     * @since 2.6.0 bbPress (r6701)
+     */
+    public function hide_notices() {
+
+        // Bail if not hiding a notice
+        if ( empty( $_GET['bbp-hide-notice'] ) ) {
+            return;
+        }
+
+        // Check the admin referer
+        check_admin_referer( 'bbp-hide-notice' );
+
+        // Maybe delete notices
+        switch ( $_GET['bbp-hide-notice'] ) {
+
+            // Skipped upgrade notice
+            case 'bbp-skip-upgrade' :
+                delete_option( '_bbp_db_upgrade_skipped' );
+                break;
+        }
     }
 

trunk/src/includes/core/options.php

@@ -31 +31 @@
 
         '_bbp_db_version'             => 0,         // Database version
+        '_bbp_db_upgrade_skipped'     => 0,         // Database upgrade skipped
 
         /** Features **********************************************************/

trunk/src/includes/core/update.php

@@ -315 +315 @@
         /** 2.6 Branch ********************************************************/
 
-        // 2.6.x
+        // 2.6 Alpha
         if ( $raw_db_version < 261 ) {
 
@@ -327 +327 @@
                 bbp_admin_upgrade_user_topic_subscriptions();
                 bbp_admin_upgrade_user_forum_subscriptions();
+            } else {
+                update_option( '_bbp_db_upgrade_skipped', $raw_db_version );
             }
         }
 
+        // 2.6 Beta/RC/GM
         if ( $raw_db_version < 262 ) {
 
@@ -339 +342 @@
             if ( ! bbp_is_large_install() ) {
                 bbp_admin_upgrade_user_engagements();
+            } else {
+                update_option( '_bbp_db_upgrade_skipped', $raw_db_version );
             }
         }