Issue 9871: Deletion og photos is now possible again

diff --git a/mod/photos.php b/mod/photos.php
index bd56fbbc6a68203db5af39086669f3b8f50daaa2..1c9e85be8c2f03c5978021621bd7862f324485c3 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1025,6 +1025,7 @@ function photos_content(App $a)
                                '$confirm' => DI::l10n()->t('Delete Album'),
                                '$confirm_url' => $drop_url,
                                '$confirm_name' => 'dropalbum',
+                               '$confirm_value' => 'dropalbum',
                                '$cancel' => DI::l10n()->t('Cancel'),
                        ]);
                }
@@ -1131,6 +1132,7 @@ function photos_content(App $a)
                                '$confirm' => DI::l10n()->t('Delete Photo'),
                                '$confirm_url' => $drop_url,
                                '$confirm_name' => 'delete',
+                               '$confirm_value' => 'delete',
                                '$cancel' => DI::l10n()->t('Cancel'),
                        ]);
                }

diff --git a/view/theme/frio/templates/confirm.tpl b/view/theme/frio/templates/confirm.tpl
index 3f8c0c3268eed5dff4c5811ce13e1ef1308ffe23..4a527704f3fab7d1c64f0df5e1b68e9ffa0eefdc 100644 (file)
--- a/view/theme/frio/templates/confirm.tpl
+++ b/view/theme/frio/templates/confirm.tpl
@@ -3,7 +3,7 @@
        <div id="confirm-message">{{$message}}</div>
 
        <div class="form-group pull-right settings-submit-wrapper">
-               <button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm_value}}">{{$confirm}}</button>
-               <button type="submit" name="canceled" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel}}</button>
+               <button type="submit" name="{{$confirm_name}}" value="{{$confirm_value}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm_value}}">{{$confirm}}</button>
+               <button type="submit" name="canceled" value="{{$cancel}} id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel}}</button>
        </div>
 </form>