Skip to content

Commit f08bb8a

Browse files
authored
SEF: Change value for trailingslash option (#43195)
1 parent 2db47e6 commit f08bb8a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

plugins/system/sef/sef.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
type="list"
5050
label="PLG_SEF_TRAILINGSLASH_LABEL"
5151
description="PLG_SEF_TRAILINGSLASH_DESCRIPTION"
52-
default="0"
52+
default="-1"
5353
filter="option"
5454
>
55-
<option value="0">PLG_SEF_TRAILINGSLASH_OPTION_NONE</option>
56-
<option value="1">PLG_SEF_TRAILINGSLASH_OPTION_NO_SLASH</option>
57-
<option value="2">PLG_SEF_TRAILINGSLASH_OPTION_SLASH</option>
55+
<option value="-1">PLG_SEF_TRAILINGSLASH_OPTION_NONE</option>
56+
<option value="0">PLG_SEF_TRAILINGSLASH_OPTION_NO_SLASH</option>
57+
<option value="1">PLG_SEF_TRAILINGSLASH_OPTION_SLASH</option>
5858
</field>
5959
</fieldset>
6060
</fields>

plugins/system/sef/src/Extension/Sef.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function onAfterRoute()
106106
}
107107

108108
// Check for trailing slash
109-
if ($app->get('sef') && !$app->get('sef_suffix') && $this->params->get('trailingslash')) {
109+
if ($app->get('sef') && !$app->get('sef_suffix') && $this->params->get('trailingslash', '-1') != '-1') {
110110
$this->enforceTrailingSlash();
111111
}
112112
}
@@ -348,14 +348,14 @@ protected function enforceTrailingSlash()
348348
$originalUri = Uri::getInstance();
349349

350350
if (
351-
(int)$this->params->get('trailingslash') === 1
351+
(int)$this->params->get('trailingslash') === 0
352352
&& str_ends_with($originalUri->getPath(), '/')
353353
&& $originalUri->toString(['scheme', 'host', 'port', 'path']) !== Uri::root()
354354
) {
355355
// Remove trailingslash
356356
$originalUri->setPath(substr($originalUri->getPath(), 0, -1));
357357
$this->getApplication()->redirect($originalUri->toString(), 301);
358-
} elseif ((int)$this->params->get('trailingslash') === 2 && !str_ends_with($originalUri->getPath(), '/')) {
358+
} elseif ((int)$this->params->get('trailingslash') === 1 && !str_ends_with($originalUri->getPath(), '/')) {
359359
// Add trailingslash
360360
$originalUri->setPath($originalUri->getPath() . '/');
361361
$this->getApplication()->redirect($originalUri->toString(), 301);

0 commit comments

Comments
 (0)