From 483e8f5ae686bf992c38fd1c68cddd3d6317dc7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 19 Apr 2017 22:29:44 +0200
Subject: Cosmetic changes to reduce diff with upstream template

---
 modules/mediawiki/templates/LocalSettings.php | 56 +++++++++++++--------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php
index cec267e1..0a10ede3 100644
--- a/modules/mediawiki/templates/LocalSettings.php
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -25,7 +25,7 @@ if ( $wgCommandLineMode ) {
 ## Uncomment this to disable output compression
 # $wgDisableOutputCompression = true;
 
-$wgSitename         = "<%= title %>";
+$wgSitename = "<%= title %>";
 
 wfLoadSkin( 'CologneBlue' );
 wfLoadSkin( 'Modern' );
@@ -36,20 +36,20 @@ wfLoadSkin( 'Vector' );
 ## defaults for all runtime URL paths are based off of this.
 ## For more information on customizing the URLs please see:
 ## http://www.mediawiki.org/wiki/Manual:Short_URL
-$wgScriptPath       = "/<%= path %>";
-$wgScriptExtension  = ".php";
+$wgScriptPath = "/<%= path %>";
+$wgScriptExtension = ".php";
 
 ## The relative URL path to the skins directory
-$wgStylePath        = "$wgScriptPath/skins";
+$wgStylePath = "$wgScriptPath/skins";
 
 ## The relative URL path to the logo.  Make sure you change this from the default,
 ## or else you'll overwrite your logo when you upgrade!
-$wgLogo             = "$wgStylePath/common/images/wiki.png";
+$wgLogo = "$wgStylePath/common/images/wiki.png";
 
 ## UPO means: this is also a user preference option
 
-$wgEnableEmail      = true;
-$wgEnableUserEmail  = true; # UPO
+$wgEnableEmail = true;
+$wgEnableUserEmail = true; # UPO
 
 $wgEmergencyContact = "root@<%= domain %>";
 $wgPasswordSender = "root@<%= domain %>";
@@ -59,16 +59,16 @@ $wgEnotifWatchlist = true; # UPO
 $wgEmailAuthentication = true;
 
 ## Database settings
-$wgDBtype           = "postgres";
-$wgDBserver         = "pg.<%= domain %>";
-$wgDBname           = "<%= db_name %>";
-$wgDBuser           = "<%= db_user %>";
-$wgDBpassword       = "<%= db_password %>";
+$wgDBtype = "postgres";
+$wgDBserver = "pg.<%= domain %>";
+$wgDBname = "<%= db_name %>";
+$wgDBuser = "<%= db_user %>";
+$wgDBpassword = "<%= db_password %>";
 
 # Postgres specific settings
-$wgDBport           = "5432";
-$wgDBmwschema       = "mediawiki";
-$wgDBts2schema      = "public";
+$wgDBport = "5432";
+$wgDBmwschema = "mediawiki";
+$wgDBts2schema = "public";
 
 ## Shared memory settings
 $wgMainCacheType = CACHE_NONE;
@@ -76,7 +76,7 @@ $wgMemCachedServers = array();
 
 ## To enable image uploads, make sure the 'images' directory
 ## is writable, then set this to true:
-$wgEnableUploads       = false;
+$wgEnableUploads = false;
 # use gd, as convert do not work for big image 
 # see https://bugs.mageia.org/show_bug.cgi?id=3202
 $wgUseImageMagick = false;
@@ -95,14 +95,14 @@ $wgShellLocale = "en_US.UTF-8";
 
 ## If you have the appropriate support software installed
 ## you can enable inline LaTeX equations:
-$wgUseTeX           = false;
+$wgUseTeX = false;
 
 ## Set $wgCacheDirectory to a writable directory on the web server
 ## to make your wiki go slightly faster. The directory should not
 ## be publically accessible from the web.
 #$wgCacheDirectory = "$IP/cache";
 
-$wgLocalInterwiki   = strtolower( $wgSitename );
+$wgLocalInterwiki = strtolower( $wgSitename );
 
 $wgLanguageCode = "<%= lang %>";
 
@@ -142,33 +142,33 @@ $wgAuth = new LdapAuthenticationPlugin();
 
 $wgLDAPUseLocal = false;
 
-$wgLDAPDomainNames = array( 'ldap');
+$wgLDAPDomainNames = array( 'ldap' );
 
 #TODO make it workable with more than one server
 $wgLDAPServerNames = array( 'ldap' => 'ldap.<%= domain %>' );
  
-$wgLDAPSearchStrings = array( 'ldap' => 'uid=USER-NAME,ou=People,<%= dc_suffix %>');
+$wgLDAPSearchStrings = array( 'ldap' => 'uid=USER-NAME,ou=People,<%= dc_suffix %>' );
 
-$wgLDAPEncryptionType = array( 'ldap' => 'tls');
+$wgLDAPEncryptionType = array( 'ldap' => 'tls' );
 
-$wgLDAPBaseDNs = array( 'ldap' => '<%= dc_suffix %>');
-$wgLDAPUserBaseDNs = array( 'ldap' => 'ou=People,<%= dc_suffix %>');
+$wgLDAPBaseDNs = array( 'ldap' => '<%= dc_suffix %>' );
+$wgLDAPUserBaseDNs = array( 'ldap' => 'ou=People,<%= dc_suffix %>' );
 $wgLDAPGroupBaseDNs = array ( 'ldap' => 'ou=Group,<%= dc_suffix %>' );
 
-$wgLDAPProxyAgent =  array( 'ldap' => 'cn=mediawiki-alamut,ou=System Accounts,<%= dc_suffix %>');
+$wgLDAPProxyAgent = array( 'ldap' => 'cn=mediawiki-alamut,ou=System Accounts,<%= dc_suffix %>' );
  
 $wgLDAPProxyAgentPassword = array( 'ldap' => '<%= ldap_password %>' );
 
-$wgLDAPUseLDAPGroups = array( "ldap" => true );
-$wgLDAPGroupNameAttribute = array( "ldap" => "cn" );
+$wgLDAPUseLDAPGroups = array( 'ldap' => true );
+$wgLDAPGroupNameAttribute = array( 'ldap' => 'cn' );
 $wgLDAPGroupUseFullDN = array( 'ldap' => true );
 $wgLDAPLowerCaseUsername = array( 'ldap' => true );
 $wgLDAPGroupObjectclass = array( 'ldap' => 'posixGroup' );
 $wgLDAPGroupAttribute = array( 'ldap' => 'member' );
 
-$wgLDAPLowerCaseUsername = array( "ldap" => true );
+$wgLDAPLowerCaseUsername = array( 'ldap' => true );
 
-$wgLDAPPreferences = array( "ldap" => array( "email"=>"mail","realname"=>"cn","nickname"=>"uid","language"=>"preferredlanguage") );
+$wgLDAPPreferences = array( 'ldap' => array( 'email'=>'mail','realname'=>'cn','nickname'=>'uid','language'=>'preferredlanguage') );
 
 $wgMinimalPasswordLength = 1;
 
-- 
cgit v1.2.1