X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fmodules%2Fcontrib%2Fredirect%2Fsrc%2FForm%2FRedirectSettingsForm.php;fp=web%2Fmodules%2Fcontrib%2Fredirect%2Fsrc%2FForm%2FRedirectSettingsForm.php;h=f2b7d1b2fb45f11c4a423c9bf7bb4c6fbc72c346;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hp=85f8957aab7abe97d87f1f7af6ebd4711587dd41;hpb=680c79a86e3ed402f263faeac92e89fb6d9edcc0;p=yaffs-website

diff --git a/web/modules/contrib/redirect/src/Form/RedirectSettingsForm.php b/web/modules/contrib/redirect/src/Form/RedirectSettingsForm.php
index 85f8957aa..f2b7d1b2f 100644
--- a/web/modules/contrib/redirect/src/Form/RedirectSettingsForm.php
+++ b/web/modules/contrib/redirect/src/Form/RedirectSettingsForm.php
@@ -61,14 +61,9 @@ class RedirectSettingsForm extends ConfigFormBase {
       '#description' => $this->t('Enabling this will automatically redirect to the canonical URL of any page. That includes redirecting to an alias if existing, removing trainling slashes, ensure the language prefix is set and similar clean-up.'),
       '#default_value' => $config->get('route_normalizer_enabled'),
     );
-    $form['globals']['redirect_canonical'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Redirect from non-canonical URLs to the canonical URLs.'),
-      '#default_value' => $config->get('canonical'),
-    );
     $form['globals']['redirect_ignore_admin_path'] = array(
       '#type' => 'checkbox',
-      '#title' => $this->t('Allow redirections on admin paths.'),
+      '#title' => $this->t('Ignore redirections on admin paths.'),
       '#default_value' => $config->get('ignore_admin_path'),
     );
     $form['globals']['redirect_access_check'] = array(
@@ -78,13 +73,6 @@ class RedirectSettingsForm extends ConfigFormBase {
       '#default_value' => $config->get('access_check'),
     );
 
-    $form['globals']['redirect_content_location_header'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Set Content Location Header'),
-      '#description' => $this->t('If enabled, will add a <a href=":canonical">Content-Location</a> header.', array(':canonical' => 'http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.14')),
-      '#default_value' => $config->get('content_location_header'),
-    );
-
     return parent::buildForm($form, $form_state);
   }