From db277786fae5552ec2d02691eb80f9ce5159803b Mon Sep 17 00:00:00 2001 From: milan88888 Date: Thu, 21 May 2026 12:24:47 +0545 Subject: [PATCH] Fix custom notices not displaying and replace notice-dismiss with ur-notice-dismiss - Fix get_single_valid_notice() to handle conditions_to_display => true, bypassing condition checks for notices that should always display for admins - Use isset() fallback for reopen_days/reopen_times to prevent undefined index errors - Replace WP core notice-dismiss/notice-dismiss-permanently/notice-dismiss-temporarily classes with ur-notice-dismiss/* to prevent WordPress admin CSS from stripping button borders and backgrounds (position:absolute, border:none, background:none) - Fix broken selector in ur-notice.css and add vertical-align/line-height to smile icon - Fix ur_repeater_fields_template_overriden_notice() returning instead of merged , which silently discarded all other custom notices --- assets/css/ur-notice.scss | 21 ++++----------- assets/js/admin/ur-notice.js | 4 +-- includes/admin/functions-ur-admin.php | 2 +- .../notifications/class-ur-admin-notices.php | 27 ++++++++++++------- .../views/html-notice-banner.php | 2 +- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/assets/css/ur-notice.scss b/assets/css/ur-notice.scss index 6f33b54c4..dc432d09c 100644 --- a/assets/css/ur-notice.scss +++ b/assets/css/ur-notice.scss @@ -27,20 +27,8 @@ width: 100%; box-sizing: border-box; - .notice-dismiss { + .ur-notice-dismiss { margin-left: 2px; - - &:before { - display: none; - } - } - - &.is-dismissible { - .notice-dismiss { - &::before { - display: block; - } - } } .user-registration-notice-thumbnail { @@ -130,16 +118,15 @@ justify-content: space-between; margin-top: 12px; - .notice-dismiss { + .ur-notice-dismiss { min-height: 32px; margin-left: 0; align-content: center; - position: unset; text-decoration: none; font-weight: 400; color: #9ca3af; - &.notice-nsa { + &.ur-notice-nsa { padding: 0; } } @@ -219,6 +206,8 @@ border: 1px solid; width: 17px; height: 17px; + line-height: 17px; + vertical-align: middle; } } diff --git a/assets/js/admin/ur-notice.js b/assets/js/admin/ur-notice.js index 2f645a1b5..9d7904aad 100644 --- a/assets/js/admin/ur-notice.js +++ b/assets/js/admin/ur-notice.js @@ -2,7 +2,7 @@ jQuery(function ($) { // Review notice. $(".user-registration-notice").each(function () { $(this) - .find(".notice-dismiss") + .find(".ur-notice-dismiss") .on("click", function (e) { e.preventDefault(); @@ -14,7 +14,7 @@ jQuery(function ($) { .data("notice-id"), notice_type_nonce = notice_type + "_nonce", dismiss_forever = $(this).hasClass( - "notice-dismiss-permanently" + "ur-notice-dismiss-permanently" ); $(this) diff --git a/includes/admin/functions-ur-admin.php b/includes/admin/functions-ur-admin.php index fe072458d..8611889ce 100644 --- a/includes/admin/functions-ur-admin.php +++ b/includes/admin/functions-ur-admin.php @@ -624,7 +624,7 @@ function promotional_notice_links( $notice_target_links, $is_permanent_dismiss ) if ( $is_permanent_dismiss ) { ?> - + $notice) { + $notice_id = $notice['type'] . '_' . $notice['id']; + $reopen_days = isset( $notice['reopen_days'] ) ? $notice['reopen_days'] : 0; + $reopen_times = isset( $notice['reopen_times'] ) ? $notice['reopen_times'] : 0; + + if ( true === $notice['conditions_to_display'] ) { + if ( current_user_can( 'manage_options' ) ) { + $valid_notice = $notice; + break; + } + continue; + } + $conditions = $notice['conditions_to_display'][0]; $operator = 'AND'; $valid_condition = array(); - $notice_id = $notice['type'] . '_' . $notice['id']; - $reopen_days = $notice['reopen_days']; - $reopen_times = $notice['reopen_times']; foreach ($conditions as $key => $value) { if ('operator' == $key) { @@ -343,14 +352,14 @@ public static function custom_notices() 'title' => __('I already did!', 'user-registration'), 'icon' => 'dashicons-smiley', 'link' => '#', - 'class' => 'button-secondary notice-dismiss notice-dismiss-permanently', + 'class' => 'button-secondary ur-notice-dismiss ur-notice-dismiss-permanently', 'target' => '', ), array( 'title' => __('Maybe later', 'user-registration'), 'icon' => 'dashicons-dismiss', 'link' => '#', - 'class' => 'button-secondary notice-dismiss notice-dismiss-temporarily', + 'class' => 'button-secondary ur-notice-dismiss ur-notice-dismiss-temporarily', 'target' => '', ), array( @@ -403,14 +412,14 @@ public static function custom_notices() 'title' => __('I already did!', 'user-registration'), 'icon' => 'dashicons-smiley', 'link' => '#', - 'class' => 'button-secondary notice-dismiss notice-dismiss-permanently', + 'class' => 'button-secondary ur-notice-dismiss ur-notice-dismiss-permanently', 'target' => '', ), array( 'title' => __('Maybe later', 'user-registration'), 'icon' => 'dashicons-dismiss', 'link' => '#', - 'class' => 'button-secondary notice-dismiss notice-dismiss-temporarily', + 'class' => 'button-secondary ur-notice-dismiss ur-notice-dismiss-temporarily', 'target' => '', ), array( @@ -466,14 +475,14 @@ public static function custom_notices() 'title' => __('I already did!', 'user-registration'), 'icon' => 'dashicons-smiley', 'link' => '#', - 'class' => 'button-secondary notice-dismiss notice-dismiss-permanently', + 'class' => 'button-secondary ur-notice-dismiss ur-notice-dismiss-permanently', 'target' => '', ), array( 'title' => __('Maybe later', 'user-registration'), 'icon' => 'dashicons-dismiss', 'link' => '#', - 'class' => 'button-secondary notice-dismiss notice-dismiss-temporarily', + 'class' => 'button-secondary ur-notice-dismiss ur-notice-dismiss-temporarily', 'target' => '', ), array( diff --git a/includes/admin/notifications/views/html-notice-banner.php b/includes/admin/notifications/views/html-notice-banner.php index c0bc271ce..4b4521079 100644 --- a/includes/admin/notifications/views/html-notice-banner.php +++ b/includes/admin/notifications/views/html-notice-banner.php @@ -33,7 +33,7 @@ - × + ×