| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -78,7 +78,7 @@ |
| 79 | 79 | * Other paths will be set to defaults based on it unless they are directly |
| 80 | 80 | * set in LocalSettings.php |
| 81 | 81 | */ |
| 82 | | -$wgScriptPath = '/wiki'; |
| | 82 | +$wgScriptPath = '/wiki'; |
| 83 | 83 | |
| 84 | 84 | /** |
| 85 | 85 | * Whether to support URLs like index.php/Page_title These often break when PHP |
| — | — | @@ -302,7 +302,7 @@ |
| 303 | 303 | * - class The class name for the repository. May come from the core or an extension. |
| 304 | 304 | * The core repository classes are LocalRepo, ForeignDBRepo, FSRepo. |
| 305 | 305 | * |
| 306 | | - * - name A unique name for the repository (but $wgLocalFileRepo should be 'local'). |
| | 306 | + * - name A unique name for the repository (but $wgLocalFileRepo should be 'local'). |
| 307 | 307 | * |
| 308 | 308 | * For most core repos: |
| 309 | 309 | * - url Base public URL |
| — | — | @@ -431,10 +431,10 @@ |
| 432 | 432 | * for non-specified types. |
| 433 | 433 | * |
| 434 | 434 | * For example: |
| 435 | | - * $wgMaxUploadSize = array( |
| 436 | | - * '*' => 250 * 1024, |
| 437 | | - * 'url' => 500 * 1024, |
| 438 | | - * ); |
| | 435 | + * $wgMaxUploadSize = array( |
| | 436 | + * '*' => 250 * 1024, |
| | 437 | + * 'url' => 500 * 1024, |
| | 438 | + * ); |
| 439 | 439 | * Sets the maximum for all uploads to 250 kB except for upload-by-url, which |
| 440 | 440 | * will have a maximum of 500 kB. |
| 441 | 441 | * |
| — | — | @@ -877,11 +877,11 @@ |
| 878 | 878 | * array = ( 'rootElement' => 'associatedMimeType' ) |
| 879 | 879 | */ |
| 880 | 880 | $wgXMLMimeTypes = array( |
| 881 | | - 'http://www.w3.org/2000/svg:svg' => 'image/svg+xml', |
| 882 | | - 'svg' => 'image/svg+xml', |
| 883 | | - 'http://www.lysator.liu.se/~alla/dia/:diagram' => 'application/x-dia-diagram', |
| 884 | | - 'http://www.w3.org/1999/xhtml:html' => 'text/html', // application/xhtml+xml? |
| 885 | | - 'html' => 'text/html', // application/xhtml+xml? |
| | 881 | + 'http://www.w3.org/2000/svg:svg' => 'image/svg+xml', |
| | 882 | + 'svg' => 'image/svg+xml', |
| | 883 | + 'http://www.lysator.liu.se/~alla/dia/:diagram' => 'application/x-dia-diagram', |
| | 884 | + 'http://www.w3.org/1999/xhtml:html' => 'text/html', // application/xhtml+xml? |
| | 885 | + 'html' => 'text/html', // application/xhtml+xml? |
| 886 | 886 | ); |
| 887 | 887 | |
| 888 | 888 | /** |
| — | — | @@ -1172,7 +1172,7 @@ |
| 1173 | 1173 | $wgDBtype = 'mysql'; |
| 1174 | 1174 | |
| 1175 | 1175 | /** Separate username for maintenance tasks. Leave as null to use the default. */ |
| 1176 | | -$wgDBadminuser = null; |
| | 1176 | +$wgDBadminuser = null; |
| 1177 | 1177 | /** Separate password for maintenance tasks. Leave as null to use the default. */ |
| 1178 | 1178 | $wgDBadminpassword = null; |
| 1179 | 1179 | |
| — | — | @@ -1182,7 +1182,7 @@ |
| 1183 | 1183 | * selected database type (eg SearchMySQL), or set to a class |
| 1184 | 1184 | * name to override to a custom search engine. |
| 1185 | 1185 | */ |
| 1186 | | -$wgSearchType = null; |
| | 1186 | +$wgSearchType = null; |
| 1187 | 1187 | |
| 1188 | 1188 | /** Table name prefix */ |
| 1189 | 1189 | $wgDBprefix = ''; |
| — | — | @@ -2645,12 +2645,12 @@ |
| 2646 | 2646 | * Custom namespaces should start at 100 to avoid conflicting with standard |
| 2647 | 2647 | * namespaces, and should always follow the even/odd main/talk pattern. |
| 2648 | 2648 | */ |
| 2649 | | -#$wgExtraNamespaces = |
| 2650 | | -# array(100 => "Hilfe", |
| 2651 | | -# 101 => "Hilfe_Diskussion", |
| 2652 | | -# 102 => "Aide", |
| 2653 | | -# 103 => "Discussion_Aide" |
| 2654 | | -# ); |
| | 2649 | +# $wgExtraNamespaces = array( |
| | 2650 | +# 100 => "Hilfe", |
| | 2651 | +# 101 => "Hilfe_Diskussion", |
| | 2652 | +# 102 => "Aide", |
| | 2653 | +# 103 => "Discussion_Aide" |
| | 2654 | +# ); |
| 2655 | 2655 | $wgExtraNamespaces = array(); |
| 2656 | 2656 | |
| 2657 | 2657 | /** |
| — | — | @@ -4551,9 +4551,9 @@ |
| 4552 | 4552 | $wgAdvertisedFeedTypes = array( 'atom' ); |
| 4553 | 4553 | |
| 4554 | 4554 | /** Show watching users in recent changes, watchlist and page history views */ |
| 4555 | | -$wgRCShowWatchingUsers = false; # UPO |
| | 4555 | +$wgRCShowWatchingUsers = false; # UPO |
| 4556 | 4556 | /** Show watching users in Page views */ |
| 4557 | | -$wgPageShowWatchingUsers = false; |
| | 4557 | +$wgPageShowWatchingUsers = false; |
| 4558 | 4558 | /** Show the amount of changed characters in recent changes */ |
| 4559 | 4559 | $wgRCShowChangedSize = true; |
| 4560 | 4560 | |
| — | — | @@ -4567,7 +4567,7 @@ |
| 4568 | 4568 | /** |
| 4569 | 4569 | * Show "Updated (since my last visit)" marker in RC view, watchlist and history |
| 4570 | 4570 | * view for watched pages with new changes */ |
| 4571 | | -$wgShowUpdatedMarker = true; |
| | 4571 | +$wgShowUpdatedMarker = true; |
| 4572 | 4572 | |
| 4573 | 4573 | /** |
| 4574 | 4574 | * Disable links to talk pages of anonymous users (IPs) in listings on special |
| — | — | @@ -4788,13 +4788,13 @@ |
| 4789 | 4789 | * |
| 4790 | 4790 | * <code> |
| 4791 | 4791 | * $wgExtensionCredits[$type][] = array( |
| 4792 | | - * 'name' => 'Example extension', |
| 4793 | | - * 'version' => 1.9, |
| 4794 | | - * 'path' => __FILE__, |
| 4795 | | - * 'author' => 'Foo Barstein', |
| 4796 | | - * 'url' => 'http://wwww.example.com/Example%20Extension/', |
| 4797 | | - * 'description' => 'An example extension', |
| 4798 | | - * 'descriptionmsg' => 'exampleextension-desc', |
| | 4792 | + * 'name' => 'Example extension', |
| | 4793 | + * 'version' => 1.9, |
| | 4794 | + * 'path' => __FILE__, |
| | 4795 | + * 'author' => 'Foo Barstein', |
| | 4796 | + * 'url' => 'http://wwww.example.com/Example%20Extension/', |
| | 4797 | + * 'description' => 'An example extension', |
| | 4798 | + * 'descriptionmsg' => 'exampleextension-desc', |
| 4799 | 4799 | * ); |
| 4800 | 4800 | * </code> |
| 4801 | 4801 | * |