Add $wgDefaultSkin setting.

Remove redundant options array in bn

diff --git a/LocalSettings.sample b/LocalSettings.sample
index 0d64d31..68ec52c 100644 (file)
--- a/LocalSettings.sample
+++ b/LocalSettings.sample
@@ -154,6 +154,10 @@ $wgLocalInterwiki   = $wgSitename;
 # $wgInputEncoding     = "UTF-8";
 # $wgOutputEncoding    = "UTF-8";
 
+## Default skin: you can change the default skin. Use the internal symbolic
+## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
+# $wgDefaultSkin = 'monobook';
+
 ## Extremely high-traffic wikis may want to disable
 ## some database-intensive features here:
 #

diff --git a/config/index.php b/config/index.php
index cb37053..a3164b3 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -760,6 +760,11 @@ if ( \$wgUsePHPTal ) {
 \$wgLanguageCode = \"{$conf->LanguageCode}\";
 " . ($conf->Encoding ? "\$wgInputEncoding = \$wgOutputEncoding = \"{$conf->Encoding}\";" : "" ) . "
 
+## Default skin: you can change the default skin. Use the internal symbolic
+## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
+# \$wgDefaultSkin = 'monobook';
+
+## This is incomplete, ignore it:
 #\$wgProxyKey = $proxyKey;
 
 ## For attaching licensing metadata to pages, and displaying an

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 72f69f1..25636e7 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -364,4 +364,8 @@ $wgUseTidy = false;
 $wgTidyBin = 'tidy';
 $wgTidyConf = $IP.'/extensions/tidy/tidy.conf'; 
 $wgTidyOpts = '';
+
+# See list of skins and their symbolic names in language/Language.php
+$wgDefaultSkin = "monobook";
+
 ?>

diff --git a/languages/Language.php b/languages/Language.php
index 7ecc0d2..eb97fc9 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -48,7 +48,7 @@ if($wgMetaNamespace === FALSE)
        "quickbar" => 1, "underline" => 1, "hover" => 1,
        "cols" => 80, "rows" => 25, "searchlimit" => 20,
        "contextlines" => 5, "contextchars" => 50,
-       "skin" => 'monobook', "math" => 1, "rcdays" => 7, "rclimit" => 50,
+       "skin" => $wgDefaultSkin, "math" => 1, "rcdays" => 7, "rclimit" => 50,
        "highlightbroken" => 1, "stubthreshold" => 0,
        "previewontop" => 1, "editsection"=>1,"editsectiononrightclick"=>0, "showtoc"=>1,
        "showtoolbar" =>1,
@@ -1964,6 +1964,7 @@ class Language {
        }
 }
 
+# This should fail gracefully if there's not a localization available
 @include_once( "Language" . ucfirst( $wgLanguageCode ) . ".php" );
 
 ?>

diff --git a/languages/LanguageBn.php b/languages/LanguageBn.php
index 357854e..5f546e8 100644 (file)
--- a/languages/LanguageBn.php
+++ b/languages/LanguageBn.php
@@ -24,16 +24,6 @@
 
 );
 
-/* private */ $wgDefaultUserOptionsBn = array(
-  "quickbar" => 1, "underline" => 1, "hover" => 1,
-  "cols" => 80, "rows" => 25, "searchlimit" => 20,
-  "contextlines" => 5, "contextchars" => 50,
-  "skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
-  "highlightbroken" => 1, "stubthreshold" => 0,
-  "previewontop" => 1, "editsection"=>1, "showtoc"=>1,
-  "date" => 0
-);
-
 /* private */ $wgQuickbarSettingsBn = array(
   "None", "Fixed left", "Fixed right", "Floating left"
 );