Merge remote-tracking branch 'upstream/develop' into item-lock

[friendica.git] / view / templates / contact_edit.tpl

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index d78d4162efa69042035619525cae1bae02938f92..9d93494a1b24c13065424f497405d236c2d5df01 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -67,8 +67,12 @@
                                        {{include file="field_checkbox.tpl" field=$notify}}
                                        {{if $fetch_further_information}}
                                                {{include file="field_select.tpl" field=$fetch_further_information}}
-                                               {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}}
+                                               {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
                                        {{/if}}
+                                       {{if $allow_remote_self}}
+                                               {{include file="field_select.tpl" field=$remote_self}}
+                                       {{/if}}
+
                                        {{include file="field_checkbox.tpl" field=$hidden}}
 
                                <div id="contact-edit-info-wrapper">
@@ -84,15 +88,6 @@
                                </div>
                                <div id="contact-info-end"></div>
                                {{/if}}
-
-                               {{if $profile_select}}
-                                       <div id="contact-edit-profile-select-text">
-                                       <h4>{{$lbl_vis1}}</h4>
-                                       <p>{{$lbl_vis2}}</p> 
-                                       </div>
-                                       {{$profile_select nofilter}}
-                                       <div id="contact-edit-profile-select-end"></div>
-                               {{/if}}
                        </div>
 
                        <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />