Merge pull request #6365 from MrPetovan/bug/6363-unescape-prev-next-link

Unescape $prevlink and $nextlink template variables

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index 08570ec496bc1fb868f38cceaed710acd2b9b66e..6f63dde2b6ce768dd8c08aea8be3847f8e3f5083 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -95,7 +95,7 @@
                                        <h4>{{$lbl_vis1}}</h4>
                                        <p>{{$lbl_vis2}}</p> 
                                        </div>
-                                       {{$profile_select}}
+                                       {{$profile_select nofilter}}
                                        <div id="contact-edit-profile-select-end"></div>
                                {{/if}}
                        </div>

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index fd5f1c0f1c1b41bc76965b416c9ed52a4b8883ac..70ebdcd0c87c0f684bebc638710aed3beb6d8ae5 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -193,7 +193,7 @@
                                                                                <p>{{$lbl_vis2}}</p>
                                                                        </div>
                                                                        <div class="form-group">
-                                                                       {{$profile_select}}
+                                                                       {{$profile_select nofilter}}
                                                                        </div>
                                                                        <div class="clear"></div>
                                                                {{/if}}

diff --git a/view/theme/frio/templates/profile_entry.tpl b/view/theme/frio/templates/profile_entry.tpl
index fb5436fb52bacd80de9331f53bddf1f617394da7..ba8f547171c9fa4921a553c016854d03bbe6c0c1 100644 (file)
--- a/view/theme/frio/templates/profile_entry.tpl
+++ b/view/theme/frio/templates/profile_entry.tpl
@@ -8,7 +8,7 @@
                <a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
        </div>
        <div class="profile-listing-cell">
-               {{$visible}}
+               {{$visible nofilter}}
        </div>
 </div>
 <div class="profile-listing-end"></div>

diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl
index 2f52f82f81cfb3e6473b0dab85296053ba9a54cc..8fbbbfc380c784462ef0907fedad9dc4c7c7e494 100644 (file)
--- a/view/theme/vier/templates/contact_edit.tpl
+++ b/view/theme/vier/templates/contact_edit.tpl
@@ -96,7 +96,7 @@
                                        <h4>{{$lbl_vis1}}</h4>
                                        <p>{{$lbl_vis2}}</p> 
                                        </div>
-                                       {{$profile_select}}
+                                       {{$profile_select nofilter}}
                                        <div id="contact-edit-profile-select-end"></div>
                                {{/if}}
                        </div>