Fix for notifications not disappearing (#2773)

* Fix data attributes like data-auto-dismiss in the notifications.
gocodebox · Oct 24, 2024 · 53b9f5c · 53b9f5c
1 parent 301d0fa
commit 53b9f5c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/.changelogs/fix_notifications-not-disappearing.yml b/.changelogs/fix_notifications-not-disappearing.yml
@@ -0,0 +1,5 @@
+significance: patch
+type: fixed
+links:
+  - "#2772"
+entry: Fix for notifications no longer auto-dismissing.
diff --git a/includes/abstracts/llms.abstract.notification.view.php b/includes/abstracts/llms.abstract.notification.view.php
@@ -192,7 +192,6 @@ public function __construct( $notification ) {
 		$this->basic_options = apply_filters( $this->get_filter( 'basic_options' ), $this->basic_options, $this );
 
 		add_filter( 'llms_user_info_shortcode_user_id', array( $this, 'set_shortcode_user' ) );
-
 	}
 
 	/**
@@ -274,6 +273,7 @@ private function get_basic_html() {
 			'notifications/basic.php',
 			array(
 				'atts'        => $atts,
+				'attributes'  => $attributes,
 				'body'        => $body,
 				'classes'     => implode( ' ', $classes ),
 				'date'        => $this->get_date_display( 5 ),
@@ -288,7 +288,6 @@ private function get_basic_html() {
 		$html = trim( preg_replace( '/\s+/S', ' ', ob_get_clean() ) );
 
 		return apply_filters( $this->get_filter( 'get_basic_html' ), $html, $this );
-
 	}
 
 	/**
@@ -322,7 +321,6 @@ public function get_date( $date = 'created', $format = null ) {
 		}
 
 		return date_i18n( $format, strtotime( $this->notification->get( $date ) ) );
-
 	}
 
 	/**
@@ -348,7 +346,6 @@ public function get_date_display( $max_days = 5 ) {
 		}
 
 		return $this->get_date( 'created' );
-
 	}
 
 	/**
@@ -491,7 +488,6 @@ public function get_html() {
 		}
 
 		return apply_filters( $this->get_filter( 'get_html' ), $html, $this );
-
 	}
 
 	/**
@@ -566,7 +562,6 @@ public function get_merge_codes() {
 		}
 
 		return apply_filters( $this->get_filter( 'get_merge_codes' ), $this->merge_codes, $this );
-
 	}
 
 	/**
@@ -591,7 +586,6 @@ protected function get_merge_code_defaults() {
 		}
 
 		return $codes;
-
 	}
 
 	/**
@@ -631,7 +625,6 @@ private function get_merged_string( $string ) {
 		}
 
 		return apply_filters( $this->get_filter( 'get_merged_string' ), $this->sentence_case( $string ), $this );
-
 	}
 
 	/**
@@ -653,7 +646,6 @@ function ( $code ) use ( $string ) {
 				ARRAY_FILTER_USE_KEY
 			)
 		);
-
 	}
 
 	/**
@@ -773,7 +765,6 @@ private function sentence_case( $string ) {
 		}
 
 		return trim( $new_string );
-
 	}
 
 	/**
@@ -797,7 +788,6 @@ protected function set_merge_data_default( $code ) {
 		}
 
 		return $code;
-
 	}
 
 	/**
@@ -824,5 +814,4 @@ protected function set_supported_fields() {
 			),
 		);
 	}
-
 }
diff --git a/templates/notifications/basic.php b/templates/notifications/basic.php
@@ -10,7 +10,11 @@
 
 defined( 'ABSPATH' ) || exit;
 ?>
-<div class="<?php echo esc_attr( $classes ); ?>"<?php echo esc_attr( $atts ); ?> id="llms-notification-<?php echo esc_attr( $id ); ?>">
+<div class="<?php echo esc_attr( $classes ); ?>"
+	<?php foreach ( (array) $attributes as $att => $val ) : ?>
+			<?php echo esc_attr( 'data-' . $att ); ?>="<?php echo esc_attr( $val ); ?>"
+	<?php endforeach; ?>
+	id="<?php echo esc_attr( 'llms-notification-' . $id ); ?>">
 
 	<?php do_action( 'llms_before_basic_notification', $id ); ?>