Merge branch '2019.01-rc' into bug/6334-escape-get-app

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

diff --git a/view/templates/photo_edit.tpl b/view/templates/photo_edit.tpl
index d435f7f3250587f507025f15326513dc91e80782..8b22dfb44cd682756b382c891dbf6e9017ace0c1 100644 (file)
--- a/view/templates/photo_edit.tpl
+++ b/view/templates/photo_edit.tpl
@@ -3,6 +3,7 @@
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
        <input type="hidden" name="item_id" value="{{$item_id}}" />
+       <input type="hidden" name="origaname" value="{{$album.2}}" />
 
        {{include file="field_input.tpl" field=$album}}
        {{include file="field_input.tpl" field=$caption}}
@@ -13,21 +14,21 @@
        {{include file="field_radio.tpl" field=$rotate_ccw}}
 
        <div id="photo-edit-perms" class="photo-edit-perms" >
-               <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}"/>
+               <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}">
                        <span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
                </a>
                <div id="photo-edit-perms-menu-end"></div>
 
                <div style="display: none;">
                        <div id="photo-edit-perms-select" >
-                               {{$aclselect}}
+                               {{$aclselect nofilter}}
                        </div>
                </div>
        </div>
        <div id="photo-edit-perms-end"></div>
 
-       <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-       <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete|escape:'html'}}" onclick="return confirmDelete()"; />
+       <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+       <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete();" />
 
        <div id="photo-edit-end"></div>
 </form>