Merge pull request #48 from Portugao/myfix-for1.6')

Fixed #47 - Current date set if no date saved.
zikula-modules · Feb 2, 2015 · c8c8550 · c8c8550
2 parents d8797ba + 303ab40
commit c8c8550
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/modules/Profile/lib/Profile/Version.php b/src/modules/Profile/lib/Profile/Version.php
@@ -30,7 +30,7 @@ public function getMetaData()
 
             'url'           => $this->__('profile'),
 
-            'version'       => '1.6.1',
+            'version'       => '1.6.2',
             'core_min' => '1.3.0', // Fixed to 1.3.x range
             'core_max' => '1.3.99', // Fixed to 1.3.x range
 

diff --git a/src/modules/Profile/templates/profile_dudedit_date.tpl b/src/modules/Profile/templates/profile_dudedit_date.tpl
@@ -12,7 +12,7 @@
 
     <span class="z-formnote">
         {gt text='%Y-%m-%d' domain='zikula' comment='This is from the core domain' assign='duddateformat'}
-        <input class="profile_dateinput {if $required}required{/if} {if $error}z-form-error{/if}" id="prop_{$attributename}" name="dynadata[{$attributename}]" value="{dateformat datetime=$timestamp|default:'-' format=$duddateformat}" size="30" />
+        <input class="profile_dateinput {if $required}required{/if} {if $error}z-form-error{/if}" id="prop_{$attributename}" name="dynadata[{$attributename}]" value="{dateformat datetime=$timestamp format=$duddateformat}" size="30" />
         {calendarinput objectname='' htmlname="prop_$attributename" dateformat=$dudformat ifformat='%Y-%m-%d' defaultdate=$value}
     </span>