From 21a3388096cbffae6c2eeaa9b7c7840a05adc0a9 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 18 Sep 2021 07:28:29 +0000
Subject: [PATCH 1/2] Issue 9871: Deletion og photos is now possible again

---
 mod/photos.php                        | 2 ++
 view/theme/frio/templates/confirm.tpl | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index bd56fbbc6..1c9e85be8 100644
--- 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 3f8c0c326..4a527704f 100644
--- 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>

From 56a143c5c6179d4728da1a16c21e4c9b50e8a5e2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 18 Sep 2021 07:32:05 +0000
Subject: [PATCH 2/2] Duplicated "value" removed

---
 view/theme/frio/templates/confirm.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/frio/templates/confirm.tpl b/view/theme/frio/templates/confirm.tpl
index 4a527704f..5e173d68c 100644
--- 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}}" value="{{$confirm_value}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm_value}}">{{$confirm}}</button>
+		<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" value="{{$cancel}} id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel}}</button>
 	</div>
 </form>