From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 7 Mar 2015 02:09:09 +0000 (-0500)
Subject: CRM-16019 - Fix timeEntry format to respect global settings
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0d05e8a1fb13762d2ae9ae24d06128890624050a;p=civicrm-core.git

CRM-16019 - Fix timeEntry format to respect global settings
---

diff --git a/js/Common.js b/js/Common.js
index 5a8e0cb9ba..c6d46e9aac 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -598,7 +598,7 @@ CRM.strings = CRM.strings || {};
           .change(updateDataField)
           .timeEntry({
             spinnerImage: '',
-            show24Hours: settings.time === true ? CRM.timeIs24Hr : settings.time == '24'
+            show24Hours: settings.time === true || settings.time === undefined ? CRM.config.timeIs24Hr : settings.time == '24'
           });
       }
       if (settings.date !== false) {