Merge pull request impress-org#3167 from ravinderk/issues/3163

fix(db-update): prevent blank screen when updating 2.0.6 to 2.1.0 impress-org#3163

Author: Devin Walker

includes/admin/upgrades/class-give-updates.php

@@ -243,11 +243,6 @@ public function __register_menu() {
 		// Load plugin updates.
 		$this->__register_plugin_addon_updates();
 
-		// Bailout.
-		if ( ! $this->get_total_update_count() ) {
-			return;
-		}
-
 		// Bailout.
 		if ( ! $this->get_total_update_count() ) {
 			// Show complete update message if still on update setting page.
@@ -304,7 +299,7 @@ public function __redirect_admin() {
 		) {
 			delete_option( 'give_show_db_upgrade_complete_notice' );
 
-			wp_redirect( add_query_arg( array( 'give-db-update-completed' => 'give_db_upgrade_completed' ) ) );
+			wp_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-updates&give-db-update-completed=give_db_upgrade_completed' ) );
 			exit();
 		}
 	}

includes/admin/upgrades/views/db-upgrades-complete-metabox.php

@@ -0,0 +1,23 @@
+<div id="give-db-updates" data-resume-update="0">
+	<div class="postbox-container">
+		<div class="postbox">
+			<h2 class="hndle"><?php esc_html_e( 'Database Updates', 'give' ); ?></h2>
+			<div class="inside">
+				<div class="progress-container">
+					<p class="update-message"><strong><?php esc_html_e( 'Updates Completed.', 'give' ) ?></strong></p>
+					<div class="progress-content">
+						<div class="notice-wrap give-clearfix">
+							<div class="notice notice-success is-dismissible inline">
+								<p><?php esc_html_e( 'Give database updates completed successfully. Thank you for updating to the latest version!', 'give' ) ?>
+								</p>
+								<button type="button" class="notice-dismiss"></button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- .inside -->
+		</div><!-- .postbox -->
+	</div>
+</div>
+<?php delete_option( 'give_show_db_upgrade_complete_notice' ); ?>

includes/admin/upgrades/views/upgrades.php

@@ -19,11 +19,7 @@
 <div class="wrap" id="poststuff">
 	<div id="give-updates">
 		<h1 id="give-updates-h1"><?php esc_html_e( 'Give - Updates', 'give' ); ?></h1>
-		<hr class="wp-header-end">
-
-		<div class="give-update-panel-content">
-			<p><?php printf( __( 'Give regularly receives new features, bug fixes, and enhancements. It is important to always stay up-to-date with latest version of Give core and its add-ons.  Please create a backup of your site before updating. To update add-ons be sure your <a href="%1$s">license keys</a> are activated.', 'give' ), 'https://givewp.com/my-account/' ); ?></p>
-		</div>
+		<hr class="wp-header-end"
 
 		<?php $db_updates = $give_updates->get_pending_db_update_count(); ?>
 		<?php if ( ! empty( $db_updates ) ) : ?>
@@ -33,6 +29,10 @@
 			$resume_updates   = get_option( 'give_doing_upgrade' );
 			$width            = ! empty( $resume_updates ) ? $resume_updates['percentage'] : 0;
 			?>
+			<div class="give-update-panel-content">
+				<p><?php printf( __( 'Give regularly receives new features, bug fixes, and enhancements. It is important to always stay up-to-date with latest version of Give core and its add-ons.  Please create a backup of your site before updating. To update add-ons be sure your <a href="%1$s">license keys</a> are activated.', 'give' ), 'https://givewp.com/my-account/' ); ?></p>
+			</div>
+
 			<div id="give-db-updates" data-resume-update="<?php echo absint( $give_updates->is_doing_updates() ); ?>">
 				<div class="postbox-container">
 					<div class="postbox">
@@ -108,6 +108,7 @@
 					</div><!-- .postbox -->
 				</div>
 			</div>
+			<?php else: include GIVE_PLUGIN_DIR . 'includes/admin/upgrades/views/db-upgrades-complete-metabox.php';?>
 		<?php endif; ?>
 
 		<?php $plugin_updates = $give_updates->get_total_plugin_update_count(); ?>