diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-01 22:47:07 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-01 22:47:07 -0800 |
| commit | 428b4dbad63d429c3b0d47b49ff5918dbda3c596 (patch) | |
| tree | 9f310f9f77dbc57eda24e69305e608f35dd04916 | |
| parent | 548bf884a4b34a4881f3188e54c592597f755dc9 (diff) | |
| download | volse-hubzilla-428b4dbad63d429c3b0d47b49ff5918dbda3c596.tar.gz volse-hubzilla-428b4dbad63d429c3b0d47b49ff5918dbda3c596.tar.bz2 volse-hubzilla-428b4dbad63d429c3b0d47b49ff5918dbda3c596.zip | |
sort out the with and howlong dependencies
| -rw-r--r-- | include/identity.php | 4 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/identity.php b/include/identity.php index 0a461dbe4..382b096fe 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1652,7 +1652,7 @@ function get_profile_fields_basic($filter = 0) { $profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null); if(! $profile_fields_basic) - $profile_fields_basic = array('name','pdesc','chandesc','gender','dob','dob_tz','address','locality','region','postal_code','country_name','marital','with','howlong','sexual','homepage','hometown','keywords','about','contact'); + $profile_fields_basic = array('name','pdesc','chandesc','gender','dob','dob_tz','address','locality','region','postal_code','country_name','marital','sexual','homepage','hometown','keywords','about','contact'); $x = array(); if($profile_fields_basic) @@ -1667,7 +1667,7 @@ function get_profile_fields_advanced($filter = 0) { $basic = get_profile_fields_basic($filter); $profile_fields_advanced = (($filter == 0) ? get_config('system','profile_fields_advanced') : null); if(! $profile_fields_advanced) - $profile_fields_advanced = array('politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','work','education'); + $profile_fields_advanced = array('with','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','work','education'); $x = array(); if($basic) diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 034a6d43d..a724c41bb 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -72,7 +72,7 @@ {{if $profile.marital}} <dl id="aprofile-marital" class="aprofile"> <dt><span class="heart">♥</span> {{$profile.marital.0}}</dt> - <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd> + <dd>{{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd> </dl> {{/if}} {{/if}} |