| Index: trunk/phase3/includes/User.php |
| — | — | @@ -169,7 +169,10 @@ |
| 170 | 170 | */ |
| 171 | 171 | function loadDefaultFromLanguage(){ |
| 172 | 172 | global $wgContLang; |
| 173 | | - $defOpt = $wgContLang->getDefaultUserOptions() ; |
| | 173 | + global $wgDefaultUserOptions; |
| | 174 | + |
| | 175 | + # Site defaults will override the global/language defaults |
| | 176 | + $defOpt = $wgDefaultUserOptions + $wgContLang->getDefaultUserOptions(); |
| 174 | 177 | foreach ( $defOpt as $oname => $val ) { |
| 175 | 178 | $this->mOptions[$oname] = $val; |
| 176 | 179 | } |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -694,9 +694,18 @@ |
| 695 | 695 | $wgTidyConf = $IP.'/extensions/tidy/tidy.conf'; |
| 696 | 696 | $wgTidyOpts = ''; |
| 697 | 697 | |
| 698 | | -# See list of skins and their symbolic names in language/Language.php |
| | 698 | +# See list of skins and their symbolic names in languagel/Language.php |
| 699 | 699 | $wgDefaultSkin = 'monobook'; |
| 700 | 700 | |
| | 701 | +# Settings added to this array will override the language globals for |
| | 702 | +# the user preferences used by anonymous visitors and newly created |
| | 703 | +# accounts. (See names and sample values in languages/Language.php) |
| | 704 | +# |
| | 705 | +# For instance, to disable section editing links: |
| | 706 | +# $wgDefaultUserOptions['editsection'] = 0; |
| | 707 | +# |
| | 708 | +$wgDefaultUserOptions = array(); |
| | 709 | + |
| 701 | 710 | # Whether or not to allow real name fields. Defaults to true. |
| 702 | 711 | $wgAllowRealName = true; |
| 703 | 712 | |