From: Tom Hughes <tom@compton.nu>
Date: Mon, 19 Nov 2018 18:53:05 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/202'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b48a593c1d23cf965eb42c6993cba78850dcf9f2?hp=6360a28e6bdb705f556e3daa3d9dab803be729e3

Merge remote-tracking branch 'github/pull/202'
---

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index b13885937..18dc6aec9 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -236,6 +236,9 @@ $wgShowIPinHeader = FALSE;
 # Job Runs by cron
 $wgJobRunRate = 0;
 
+# dissolves double redirects automatically
+$wgFixDoubleRedirects = TRUE;
+
 # Allow external images from a few sites
 $wgAllowExternalImagesFrom = array( 'http://tile.openstreetmap.org/', 'http://svenanders.openstreetmap.de/', 'http://josm.openstreetmap.de/', 'http://trac.openstreetmap.org/', 'http://rweait.dev.openstreetmap.org/' );