Remove duplicated '$baseurl' template variable declarations

- This variable is declared for all templates in Renderer

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 6edef06fc65c56b0b4b7d49a00c753b21b351277..776ce3e80a92d46b6dc588ab21c359579f0143a5 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -332,7 +332,6 @@ class Conversation
                $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
                $this->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$newpost'   => 'true',
-                       '$baseurl'   => $this->baseURL,
                        '$geotag'    => $geotag,
                        '$nickname'  => $x['nickname'],
                        '$ispublic'  => $this->l10n->t('Visible to <strong>everybody</strong>'),
@@ -405,7 +404,6 @@ class Conversation
                        '$posttype'     => $notes_cid ? ItemModel::PT_PERSONAL_NOTE : ItemModel::PT_ARTICLE,
                        '$content'      => $x['content'] ?? '',
                        '$post_id'      => $x['post_id'] ?? '',
-                       '$baseurl'      => $this->baseURL,
                        '$defloc'       => $x['default_location'],
                        '$visitor'      => $x['visitor'],
                        '$pvisit'       => $notes_cid ? 'none' : $x['visitor'],
@@ -591,7 +589,6 @@ class Conversation
                }
 
                $o = Renderer::replaceMacros($page_template, [
-                       '$baseurl'     => $this->baseURL,
                        '$return_path' => $this->args->getQueryString(),
                        '$live_update' => $live_update_div,
                        '$remove'      => $this->l10n->t('remove'),

diff --git a/src/Module/Moderation/Blocklist/Contact.php b/src/Module/Moderation/Blocklist/Contact.php
index 253f1dba044165818572e915f4bb8b23b788d475..d726b4d9b3a525e758d35f7619795d8200e1b1bd 100644 (file)
--- a/src/Module/Moderation/Blocklist/Contact.php
+++ b/src/Module/Moderation/Blocklist/Contact.php
@@ -124,8 +124,6 @@ class Contact extends BaseModeration
                        '$form_security_token' => self::getFormSecurityToken('moderation_contactblock'),
 
                        // values //
-                       '$baseurl' => $this->baseUrl,
-
                        '$contacts'       => $contacts,
                        '$total_contacts' => $this->tt('%s total blocked contact', '%s total blocked contacts', $total),
                        '$paginate'       => $pager->renderFull($total),

diff --git a/src/Module/Moderation/Blocklist/Server/Add.php b/src/Module/Moderation/Blocklist/Server/Add.php
index 9a56a7516f9fe73f70c09fa0645f045927bbf0c0..6f498ac29a32f1212b63a42ac0708fed64761bf2 100644 (file)
--- a/src/Module/Moderation/Blocklist/Server/Add.php
+++ b/src/Module/Moderation/Blocklist/Server/Add.php
@@ -138,7 +138,6 @@ class Add extends BaseModeration
                        '$newreason'           => ['reason', $this->t('Block reason'), $request['reason'] ?? '', $this->t('The reason why you blocked this server domain pattern. This reason will be shown publicly in the server information page.'), $this->t('Required'), '', ''],
                        '$pattern'             => $pattern,
                        '$gservers'            => $gservers,
-                       '$baseurl'             => $this->baseUrl,
                        '$form_security_token' => self::getFormSecurityToken('moderation_blocklist_add')
                ]);
        }

diff --git a/src/Module/Moderation/Blocklist/Server/Import.php b/src/Module/Moderation/Blocklist/Server/Import.php
index 10c1f36ee6191c6139543f8671725db21aed3971..1131855c08c5e7df710ddb8e646962ed8df20702 100644 (file)
--- a/src/Module/Moderation/Blocklist/Server/Import.php
+++ b/src/Module/Moderation/Blocklist/Server/Import.php
@@ -130,7 +130,6 @@ class Import extends \Friendica\Module\BaseModeration
                        '$mode_append'         => ['mode', $this->t('Append'), 'append', $this->t('Imports patterns from the file that weren\'t already existing in the current blocklist.'), 'checked="checked"'],
                        '$mode_replace'        => ['mode', $this->t('Replace'), 'replace', $this->t('Replaces the current blocklist by the imported patterns.')],
                        '$blocklist'           => $this->blocklist,
-                       '$baseurl'             => $this->baseUrl,
                        '$form_security_token' => self::getFormSecurityToken('moderation_blocklist_import')
                ]);
        }

diff --git a/src/Module/Moderation/Blocklist/Server/Index.php b/src/Module/Moderation/Blocklist/Server/Index.php
index 3b6dc735ddc5195ca455301db39fa36a5382b8f2..466748ea1fc2d1a163d7f66bc768bc1e88dccf43 100644 (file)
--- a/src/Module/Moderation/Blocklist/Server/Index.php
+++ b/src/Module/Moderation/Blocklist/Server/Index.php
@@ -115,7 +115,6 @@ class Index extends BaseModeration
                        '$listfile'  => ['listfile', $this->t('Server domain pattern blocklist CSV file'), '', '', $this->t('Required'), '', 'file'],
                        '$newdomain' => ['pattern', $this->t('Server Domain Pattern'), '', $this->t('The domain pattern of the new server to add to the blocklist. Do not include the protocol.'), $this->t('Required'), '', ''],
                        '$entries'   => $blocklistform,
-                       '$baseurl'   => $this->baseUrl,
 
                        '$form_security_token'        => self::getFormSecurityToken('moderation_blocklist'),
                        '$form_security_token_import' => self::getFormSecurityToken('moderation_blocklist_import'),

diff --git a/src/Module/Moderation/Reports.php b/src/Module/Moderation/Reports.php
index 8c0f6cde6650c580e0e93de12dac8029f16bbca0..c9aa92df9c967baab82964d2c1a38d4a80be6cf4 100644 (file)
--- a/src/Module/Moderation/Reports.php
+++ b/src/Module/Moderation/Reports.php
@@ -95,8 +95,6 @@ class Reports extends BaseModeration
                        '$th_reports' => [$this->t('Created'), $this->t('Photo'), $this->t('Name'), $this->t('Comment'), $this->t('Category')],
 
                        // values //
-                       '$baseurl' => $this->baseUrl,
-
                        '$reports'       => $reports,
                        '$total_reports' => $this->tt('%s total report', '%s total reports', $total),
                        '$paginate'      => $pager->renderFull($total),

diff --git a/src/Module/Moderation/Users/Active.php b/src/Module/Moderation/Users/Active.php
index e90baf8c68b44e6b1ed889a4217735a4154ec1d3..f3bed0f989a6ae6c122897044267d79fe80bb956 100644 (file)
--- a/src/Module/Moderation/Users/Active.php
+++ b/src/Module/Moderation/Users/Active.php
@@ -150,7 +150,6 @@ class Active extends BaseUsers
                        '$form_security_token' => self::getFormSecurityToken('moderation_users_active'),
 
                        // values //
-                       '$baseurl'      => $this->baseUrl,
                        '$query_string' => $this->args->getQueryString(),
 
                        '$users' => $users,

diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php
index 34c9aabd01525d711a2dcd4c10c1f1df52374bb7..c2b6cc4e6462a914ccc6f7118f885f286dda7bd2 100644 (file)
--- a/src/Module/Settings/Channels.php
+++ b/src/Module/Settings/Channels.php
@@ -228,7 +228,6 @@ class Channels extends BaseSettings
                                'confirm_delete' => $this->t('Delete entry from the channel list?'),
                        ],
                        '$entries' => $channels,
-                       '$baseurl' => $this->baseUrl,
 
                        '$form_security_token' => self::getFormSecurityToken('settings_channels'),
                ]);