Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced repeated code from get_current_notice with the function call.

This commit is contained in:
Peter Fabian 2020-05-13 16:36:09 +02:00
parent a2f985414e
commit 6b11451b88
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
includes/admin/notes/class-wc-notes-run-db-update.php
View File

@ -263,26 +263,22 @@ class WC_Notes_Run_Db_Update {
*/ */
private static function should_show_notice() { private static function should_show_notice() {
if ( ! \WC_Install::needs_db_update() ) { if ( ! \WC_Install::needs_db_update() ) {
try {
$data_store = \WC_Data_Store::load( 'admin-note' ); $note_id = self::get_current_notice();
} catch ( Exception $e ) {
// Bail out in case of incorrect use. // Db update not needed && note does not exist -> don't show it.
if ( ! $note_id ) {
return false; return false;
} }
$note_ids = $data_store->get_notes_with_name( self::NOTE_NAME );
if ( ! empty( $note_ids ) ) {
// Db update not needed && note actioned -> don't show it. // Db update not needed && note actioned -> don't show it.
$note = new WC_Admin_Note( $note_ids[0] ); $note = new WC_Admin_Note( $note_id );
if ( $note::E_WC_ADMIN_NOTE_ACTIONED === $note->get_status() ) { if ( $note::E_WC_ADMIN_NOTE_ACTIONED === $note->get_status() ) {
return false; return false;
} }
} else {
// Db update not needed && note does not exist -> don't show it.
return false;
}
} }
// Db update needed -> show notice.
return true; return true;
} }