bug:2822 editing photo replaces date_creation time to 00:00:00

git-svn-id: http://piwigo.org/svn/trunk@20531 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 9 insertions, 4 deletions

diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index e6152988b..033e52139 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -146,7 +146,8 @@ if (isset($_POST['submit']) and count($page['errors']) == 0)
     $data{'date_creation'} =
       $_POST['date_creation_year']
       .'-'.$_POST['date_creation_month']
-      .'-'.$_POST['date_creation_day'];
+      .'-'.$_POST['date_creation_day']
+      .' '.$_POST['date_creation_time'];
   }
   else
   {
@@ -349,18 +350,20 @@ unset($day, $month, $year);
 if (isset($_POST['date_creation_action'])
     and 'set' == $_POST['date_creation_action'])
 {
-  foreach (array('day', 'month', 'year') as $varname)
+  foreach (array('day', 'month', 'year', 'time') as $varname)
   {
     $$varname = $_POST['date_creation_'.$varname];
   }
 }
 else if (isset($row['date_creation']) and !empty($row['date_creation']))
 {
-  list($year, $month, $day) = explode('-', $row['date_creation']);
+  list($year, $month, $day) = explode('-', substr($row['date_creation'],0,10));
+  $time = substr($row['date_creation'],11);
 }
 else
 {
   list($year, $month, $day) = array('', 0, 0);
+  $time = '00:00:00';
 }
 
 
@@ -373,6 +376,7 @@ $template->assign(
       'DATE_CREATION_DAY_VALUE' => $day,
       'DATE_CREATION_MONTH_VALUE' => $month,
       'DATE_CREATION_YEAR_VALUE' => $year,
+      'DATE_CREATION_TIME_VALUE' => $time,
       'month_list' => $month_list,
       )
     );
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index d76a02e32..5d2238eea 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -104,7 +104,8 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
 
       <input id="date_creation_year" name="date_creation_year" type="text" size="4" maxlength="4" value="{$DATE_CREATION_YEAR_VALUE}">
       <input id="date_creation_linked_date" name="date_creation_linked_date" type="hidden" size="10" disabled="disabled">
-    <a href="#" id="unset_date_creation" style="display:none">unset</a>
+      <input name="date_creation_time" type="hidden" value="{$DATE_CREATION_TIME_VALUE}">
+      <a href="#" id="unset_date_creation" style="display:none">unset</a>
     </p>
 
     <p>