From 3020dfbeeb7f0d3e4c808d18da7195a0f380f05d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 30 Oct 2022 15:48:28 -0400 Subject: [PATCH] Rename auto_request.tpl form action template variable --- mod/follow.php | 2 +- mod/unfollow.php | 2 +- src/Module/RemoteFollow.php | 2 +- view/templates/auto_request.tpl | 2 +- view/theme/frio/templates/auto_request.tpl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/follow.php b/mod/follow.php index db7a52b2c..cd39d4dda 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -143,7 +143,7 @@ function follow_content(App $a) '$submit' => $submit, '$cancel' => DI::l10n()->t('Cancel'), - '$request' => $request, + '$action' => $request, '$name' => $contact['name'], '$url' => $contact['url'], '$zrl' => Profile::zrl($contact['url']), diff --git a/mod/unfollow.php b/mod/unfollow.php index 8431d04d0..6a7bf3503 100644 --- a/mod/unfollow.php +++ b/mod/unfollow.php @@ -99,7 +99,7 @@ function unfollow_content(App $a) '$zrl' => Contact::magicLinkByContact($contact), '$url_label' => DI::l10n()->t('Profile URL'), '$myaddr' => $self['url'], - '$request' => $request, + '$action' => $request, '$keywords' => '', '$keywords_label'=> '' ]); diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php index 05239440d..ce5c6f60e 100644 --- a/src/Module/RemoteFollow.php +++ b/src/Module/RemoteFollow.php @@ -127,7 +127,7 @@ class RemoteFollow extends BaseModule '$submit' => $this->t('Submit Request'), '$cancel' => $this->t('Cancel'), - '$request' => 'remote_follow/' . $this->parameters['profile'], + '$action' => 'remote_follow/' . $this->parameters['profile'], '$name' => $this->owner['name'], '$myaddr' => Profile::getMyURL(), ]); diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl index a3bd9c2cd..0cfe584d5 100644 --- a/view/templates/auto_request.tpl +++ b/view/templates/auto_request.tpl @@ -9,7 +9,7 @@

{{/if}} -
+ {{if $url}}
{{$url_label}}
diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl index eec9c7f3e..2d1861389 100644 --- a/view/theme/frio/templates/auto_request.tpl +++ b/view/theme/frio/templates/auto_request.tpl @@ -9,7 +9,7 @@

{{/if}} - + {{if $url}}
{{$url_label}}