diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-08-24 17:05:18 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-08-24 17:05:18 +0100 |
| commit | c803fb90df3bbbd8bb88df09a271b5a9214e8c1d (patch) | |
| tree | 0ad021580411798fc0ab025f1b1c302fe8afd3f6 /view/tpl/settings.tpl | |
| parent | 6999fb586ba90e9f1c79e9f09f4035f63fb925fd (diff) | |
| parent | b0dd38b30949f907265eda757bfa14aa1f38b38f (diff) | |
| download | volse-hubzilla-c803fb90df3bbbd8bb88df09a271b5a9214e8c1d.tar.gz volse-hubzilla-c803fb90df3bbbd8bb88df09a271b5a9214e8c1d.tar.bz2 volse-hubzilla-c803fb90df3bbbd8bb88df09a271b5a9214e8c1d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 9a3a1ce8b..194b90e80 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -50,6 +50,9 @@ {{include file="field_input.tpl" field=$cntunkmail}} + +{{if $expireisfixed}} +{{* Remove above line when expire is working *}} {{include file="field_input.tpl" field=$expire.days}} @@ -65,6 +68,7 @@ </div> </div> +{{/if}} <div id="settings-default-perms" class="settings-default-perms" > <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a> |