From a0dcb5611b5a5306689a4d3d80b31e89787e127f Mon Sep 17 00:00:00 2001
From: "Uwe.Tews@googlemail.com" <Uwe.Tews@googlemail.com>
Date: Fri, 13 Sep 2013 20:48:40 +0000
Subject: [PATCH]  - bugfix html_select_time defaulting error for the Meridian
 dropdown (forum topic 24549)

---
 change_log.txt                             | 11 +++++++----
 libs/plugins/function.html_select_time.php |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/change_log.txt b/change_log.txt
index 3b63b92f..8b88383b 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,16 +1,19 @@
  ===== trunk =====
+13.09.2013
+ - bugfix html_select_time defaulting error for the Meridian dropdown (forum topic 24549)
+
 09.09.2012
-- bugfix incorrect compiled code with array(object,method) callback at registered Variable Filter (forum topic 24542}
+- bugfix incorrect compiled code with array(object,method) callback at registered Variable Filter (forum topic 24542)
 
 27.08.2013
-- bugfix delimiter followed by linebreak did not work as auto literal after update from 24.08.2013 (forum topic 24518}
+- bugfix delimiter followed by linebreak did not work as auto literal after update from 24.08.2013 (forum topic 24518)
 
 24.08.2013
 - bugfix and enhancement
   Because several recent problems with template inheritance the {block} tag compiler has been rewriten
    - Error messages shown now the correct child template file and line number
-   - The compiler could fail on some larger UTF-8 text block (forum topic 24455}
-   - The {strip} tag can now be placed outside {block} tags in child templates (forum topic 24289}
+   - The compiler could fail on some larger UTF-8 text block (forum topic 24455)
+   - The {strip} tag can now be placed outside {block} tags in child templates (forum topic 24289)
 - change SmartyException::$escape  is now false by default
 - change PHP traceback has been remove for SmartyException and SmartyCompilerException
    
diff --git a/libs/plugins/function.html_select_time.php b/libs/plugins/function.html_select_time.php
index a486f309..9e7f9117 100644
--- a/libs/plugins/function.html_select_time.php
+++ b/libs/plugins/function.html_select_time.php
@@ -345,7 +345,7 @@ function smarty_function_html_select_time($params, $template)
             $_html_meridian .= '<option value="">' . ( isset($meridian_empty) ? $meridian_empty : $all_empty ) . '</option>' . $option_separator;
         }
 
-        $_html_meridian .= '<option value="am"'. ($_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
+        $_html_meridian .= '<option value="am"'. ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
             . '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator
             . '</select>';
     }