CRM-16019 - Fix timeEntry format to respect global settings
authorColeman Watts <coleman@civicrm.org>
Sat, 7 Mar 2015 02:09:09 +0000 (21:09 -0500)
committerColeman Watts <coleman@civicrm.org>
Sat, 7 Mar 2015 02:09:09 +0000 (21:09 -0500)
js/Common.js

index 5a8e0cb9babaa94a16b2db247c4c57b493e5c1a6..c6d46e9aac76877677ec0650d2c10d3cc478064c 100644 (file)
@@ -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) {