Merge pull request #12500 from pradpnayak/28

[civicrm-core.git] / js / Common.js

diff --git a/js/Common.js b/js/Common.js
index 0460403c79df7b0ff13453871b47ae773c0b62de..8a5306763778e4b27059c4a0e07e57a9bd870545 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -1247,7 +1247,7 @@ if (!CRM.vars) CRM.vars = {};
         unique: true
       };
       options = $.extend(extra, options);
-      options.expires = options.expires === false ? 0 : parseInt(options.expires, 10);
+      options.expires = (options.expires === false || !CRM.config.allowAlertAutodismissal) ? 0 : parseInt(options.expires, 10);
       if (options.unique && options.unique !== '0') {
         $('#crm-notification-container .ui-notify-message').each(function () {
           if (title === $('h1', this).html() && text === $('.notify-content', this).html()) {