This commit was manufactured by cvs2svn to create tag1.3.0beta4a

'REL1_3_0beta4a'.

1 files changed, 80 insertions, 57 deletions

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 52eb0b1ef1d8..0eaf809ba8ce 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1,4 +1,5 @@
 <?php
+# $Id$
 # DO NOT EDIT THIS FILE!
 # To customize your installation, edit "LocalSettings.php".
 # Note that since all these string interpolations are expanded
@@ -6,27 +7,27 @@
 # like $wgScriptPath, you must also localize everything that
 # depends on it.
 
-$wgVersion			= "1.3.0beta1";
+$wgVersion			= '1.3.0beta4';
 
-$wgSitename         = "MediaWiki"; # Please customize!
+$wgSitename         = 'MediaWiki'; # Please customize!
 $wgMetaNamespace    = FALSE; # will be same as you set $wgSitename
 
 
 # check if server use https:
-$wgProto = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? "https" : "http";
+$wgProto = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
 
 if ( @$wgCommandLineMode ) {
-	$wgServer = $wgProto."://localhost";
+	$wgServer = $wgProto.'://localhost';
 } else {
-	$wgServer           = $wgProto."://" . $_SERVER["SERVER_NAME"];
-	if( $_SERVER["SERVER_PORT"] != 80 ) $wgServer .= ":" . $_SERVER["SERVER_PORT"];
+	$wgServer           = $wgProto.'://' . $_SERVER['SERVER_NAME'];
+	if( $_SERVER['SERVER_PORT'] != 80 ) $wgServer .= ":" . $_SERVER['SERVER_PORT'];
 }
 unset($wgProto);
 
-$wgScriptPath	    = "/wiki";
+$wgScriptPath	    = '/wiki';
 
 # Whether to support URLs like index.php/Page_title
-$wgUsePathInfo		= ( strpos( php_sapi_name(), "cgi" ) === false );
+$wgUsePathInfo		= ( strpos( php_sapi_name(), 'cgi' ) === false );
 
 # ATTN: Old installations used wiki.phtml and redirect.phtml -
 # make sure that LocalSettings.php is correctly set!
@@ -44,25 +45,30 @@ $wgLogo				= "{$wgUploadPath}/wiki.png";
 $wgMathPath         = "{$wgUploadPath}/math";
 $wgMathDirectory    = "{$wgUploadDirectory}/math";
 $wgTmpDirectory     = "{$wgUploadDirectory}/tmp";
-$wgEmergencyContact = "wikiadmin@" . getenv( "SERVER_NAME" );
-$wgPasswordSender	= "Wikipedia Mail <apache@" . getenv( "SERVER_NAME" ) . ">";
+$wgEmergencyContact = 'wikiadmin@' . getenv( 'SERVER_NAME' );
+$wgPasswordSender	= 'Wikipedia Mail <apache@' . getenv( 'SERVER_NAME' ) . '>';
 
 # For using a direct (authenticated) SMTP server connection.
 # "host" => 'SMTP domain', "IDHost" => 'domain for MessageID', "port" => "25", "auth" => true/false, "username" => user, "password" => password
 $wgSMTP				= false;
 
-# MySQL settings
+# Database settings
 #
-$wgDBserver         = "localhost";
-$wgDBname           = "wikidb";
-$wgDBconnection     = "";
-$wgDBuser           = "wikiuser";
+$wgDBserver         = 'localhost';
+$wgDBname           = 'wikidb';
+$wgDBconnection     = '';
+$wgDBuser           = 'wikiuser';
+$wgDBtype           = "mysql"; # "mysql" for working code and "pgsql" for development/broken code
+
+# Database load balancer
+$wgDBservers		= false; # e.g. array(0 => "larousse", 1 => "pliny")
+$wgDBloads			= false; # e.g. array(0 => 0.6, 1 => 0.4);
 
 # Sysop SQL queries
 $wgAllowSysopQueries = false; # Dangerous if not configured properly.
-$wgDBsqluser		= "sqluser";
-$wgDBsqlpassword	= "sqlpass";
-$wgDBpassword       = "userpass";
+$wgDBsqluser		= 'sqluser';
+$wgDBsqlpassword	= 'sqlpass';
+$wgDBpassword       = 'userpass';
 $wgSqlLogFile           = "{$wgUploadDirectory}/sqllog_mFhyRe6";
 
 $wgDBminWordLen     = 4;
@@ -85,27 +91,28 @@ $wgDBloads			= false; # e.g. array(0.6, 0.4);
 #
 $wgMemCachedDebug   = false; # Will be set to false in Setup.php, if the server isn't working
 $wgUseMemCached     = false;
-$wgMemCachedServers = array( "127.0.0.1:11000" );
+$wgMemCachedServers = array( '127.0.0.1:11000' );
 $wgMemCachedDebug   = false;
 $wgSessionsInMemcached = false;
 $wgLinkCacheMemcached = false; # Not fully tested
 
 # Language settings
 #
-$wgLanguageCode     = "en";
+$wgLanguageCode     = 'en';
 $wgLanguageFile     = false; # Filename of a language file generated by dumpMessages.php
 $wgInterwikiMagic	= true; # Treat language links as magic connectors, not inline links
-$wgInputEncoding	= "ISO-8859-1";
-$wgOutputEncoding	= "ISO-8859-1";
-$wgEditEncoding		= "";
-$wgMimeType			= "text/html";
-$wgDocType			= "-//W3C//DTD XHTML 1.0 Transitional//EN";
-$wgDTD				= "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";
+$wgInputEncoding	= 'ISO-8859-1'; # LanguageUtf8.php normally overrides this
+$wgOutputEncoding	= 'ISO-8859-1'; # unless you set the next option to true:
+$wgUseLatin1 		= false; # Enable ISO-8859-1 compatibility mode
+$wgEditEncoding		= '';
+$wgMimeType			= 'text/html';
+$wgDocType			= '-//W3C//DTD XHTML 1.0 Transitional//EN';
+$wgDTD				= 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd';
 $wgUseDynamicDates  = false; # Enable to allow rewriting dates in page text
 							 # DOES NOT FORMAT CORRECTLY FOR MOST LANGUAGES
 $wgAmericanDates    = false; # Enable for English module to print dates
 							 # as eg 'May 12' instead of '12 May'
-$wgLocalInterwiki   = "w";
+$wgLocalInterwiki   = 'w';
 $wgShowIPinHeader	= true; # For non-logged in users
 $wgMaxNameChars     = 32; # Maximum number of bytes in username
 $wgInterwikiExpiry = 10800; # Expiry time for cache of interwiki table
@@ -115,8 +122,8 @@ $wgInterwikiExpiry = 10800; # Expiry time for cache of interwiki table
 $wgUseDatabaseMessages = true;
 $wgMsgCacheExpiry	= 86400;
 
-$wgExtraSubtitle	= "";
-$wgSiteSupportPage	= "";
+$wgExtraSubtitle	= '';
+$wgSiteSupportPage	= '';
 
 # Miscellaneous configuration settings
 #
@@ -124,7 +131,7 @@ $wgReadOnlyFile         = "{$wgUploadDirectory}/lock_yBgMBwiR";
 
 # The debug log file should be not be publicly accessible if it is
 # used, as it may contain private data.
-$wgDebugLogFile         = "";
+$wgDebugLogFile         = '';
 $wgDebugRedirects		= false;
 
 $wgDebugComments        = false;
@@ -142,6 +149,11 @@ $wgIgnoreSQLErrors      = false;
 # all articles in the category)
 $wgUseCategoryMagic		= true;
 
+# disable experimental dmoz-like category browsing. Output things like:
+# Encyclopedia > Music > Style of Music > Jazz
+# FIXME: need fixing
+$wgUseCategoryBrowser   = false;
+
 $wgEnablePersistentLC	= false;	# Persistent link cache in linkscc table; FAILS on MySQL 3.x
 $wgCompressedPersistentLC = true; # use gzcompressed blobs
 
@@ -158,24 +170,26 @@ $wgHitcounterUpdateFreq = 1;
 # User rights 
 $wgWhitelistEdit = false;   # true = user must login to edit.
 $wgWhitelistRead = false;	# Pages anonymous user may see, like: = array ( ":Main_Page", "Special:Userlogin", "Wikipedia:Help");
-$wgWhitelistAccount = array ( "user" => 1, "sysop" => 1, "developer" => 1 );
+$wgWhitelistAccount = array ( 'user' => 1, 'sysop' => 1, 'developer' => 1 );
 $wgSysopUserBans        = false; # Allow sysops to ban logged-in users
 $wgSysopRangeBans		= false; # Allow sysops to ban IP ranges
-$wgDefaultBlockExpiry	= "24 hours"; # default expiry time
+$wgDefaultBlockExpiry	= '24 hours'; # default expiry time
                                 # strtotime format, or "infinite" for an infinite block
 $wgAutoblockExpiry		= 86400; # Number of seconds before autoblock entries expire
 $wgBlockOpenProxies = false; # Automatic open proxy test on edit
 $wgProxyPorts = array( 80, 81, 1080, 3128, 6588, 8000, 8080, 8888, 65506 );
 $wgProxyScriptPath = "$IP/proxy_check.php";
 $wgProxyMemcExpiry = 86400;
-$wgProxyKey = "W1svekXc5u6lZllTZOwnzEk1nbs";
+$wgProxyKey = 'W1svekXc5u6lZllTZOwnzEk1nbs';
+$wgProxyList = array();  # big list of banned IP addresses, in the keys not the values
+$wgAccountCreationThrottle = 0; # Number of accounts each IP address may create, 0 to disable. Requires memcached
 
 # Client-side caching:
 $wgCachePages       = true; # Allow client-side caching of pages
 
 # Set this to current time to invalidate all prior cached pages.
 # Affects both client- and server-side caching.
-$wgCacheEpoch = "20030516000000";
+$wgCacheEpoch = '20030516000000';
 
 # Server-side caching:
 #  This will cache static pages for non-logged-in users
@@ -205,8 +219,8 @@ $wgCookieExpiration = 2592000;
 
 # Set to set an explicit domain on the login cookies
 # eg, "justthis.domain.org" or ".any.subdomain.net"
-$wgCookieDomain = "";
-$wgCookiePath = "/";
+$wgCookieDomain = '';
+$wgCookiePath = '/';
 $wgDisableCookieCheck = false;
 
 $wgAllowExternalImages = true;
@@ -220,18 +234,7 @@ $wgWLCacheTimeout = 3600;	# The hour or so mentioned above
 # convert (ImageMagick) installed and available in the PATH.
 # Please see math/README for more information.
 $wgUseTeX = false;
-$wgTexvc = "./math/texvc"; # Location of the texvc binary
-
-# Support for inline hieroglyphs, see http://aoineko.free.fr/ The
-# WikiHiero php files must be present in the same directory as the
-# rest of the mediawiki code, and WikiHiero must have been configured
-# with the correct image locations.
-$wgUseWikiHiero = false;
-
-# Support for inline timelines, see http://members.chello.nl/epzachte/Wikipedia/EasyTimeline/Introduction.htm
-# The Timeline php files must be present in the extension directory and you must have the
-# ploticus tool available, see http://ploticus.sourceforge.net/
-$wgUseTimeline = false;
+$wgTexvc = './math/texvc'; # Location of the texvc binary
 
 # Profiling / debugging
 $wgProfiling = false; # Enable for more detailed by-function times in debug log
@@ -253,11 +256,11 @@ $wgDisableAnonTalk = false;
 # We can serve pages compressed in order to save bandwidth,
 # but this will increase CPU usage.
 # Requires zlib support enabled in PHP.
-$wgUseGzip = function_exists( "gzencode" );
+$wgUseGzip = function_exists( 'gzencode' );
 
 # Path to the GNU diff3 utility. If the file doesn't exist,
 # edit conflicts will fall back to the old behaviour (no merging).
-$wgDiff3 = "/usr/bin/diff3";
+$wgDiff3 = '/usr/bin/diff3';
 
 # We can also compress text in the old revisions table. If this is set on,
 # old revisions will be compressed on page save if zlib support is available.
@@ -267,18 +270,18 @@ $wgCompressRevisions = false;
 
 # This is the list of preferred extensions for uploading files. Uploading
 # files with extensions not in this list will trigger a warning.
-$wgFileExtensions = array( "png", "jpg", "jpeg", "ogg" );
+$wgFileExtensions = array( 'png', 'jpg', 'jpeg', 'ogg' );
 
 # Files with these extensions will never be allowed as uploads.
 $wgFileBlacklist = array(
 	# HTML may contain cookie-stealing JavaScript and web bugs
-	"html", "htm",
+	'html', 'htm',
 	# PHP scripts may execute arbitrary code on the server
-	"php", "phtml", "php3", "php4", "phps",
+	'php', 'phtml', 'php3', 'php4', 'phps',
 	# Other types that may be interpreted by some servers
-	"shtml", "jhtml", "pl", "py",
+	'shtml', 'jhtml', 'pl', 'py',
 	# May contain harmful executables for Windows victims
-	"exe", "scr", "dll", "msi", "vbs", "bat", "com", "pif", "cmd", "vxd", "cpl" );
+	'exe', 'scr', 'dll', 'msi', 'vbs', 'bat', 'com', 'pif', 'cmd', 'vxd', 'cpl' );
 
 # This is a flag to determine whether or not to check file extensions on
 # upload.
@@ -288,6 +291,9 @@ $wgCheckFileExtensions = true;
 # covered by $wgFileExtensions.
 $wgStrictFileExtensions = true;
 
+# Warn if uploaded files are larger than this
+$wgUploadSizeWarning = 150000;
+
 $wgPasswordSalt = true; # For compatibility with old installations set to false
 
 # Which namespaces should support subpages?
@@ -318,7 +324,7 @@ $wgUseImageResize		= false;
 ## of the builtin functions
 #
 $wgUseImageMagick		= false;
-$wgImageMagickConvertCommand    = "/usr/bin/convert";
+$wgImageMagickConvertCommand    = '/usr/bin/convert';
 
 # PHPTal is a library for page templates. MediaWiki includes
 # a recent PHPTal distribution. It is required to use the
@@ -332,6 +338,9 @@ if( !isset( $wgCommandLineMode ) ) {
 # Show seconds in Recent Changes
 $wgRCSeconds = false;
 
+# Log IP addresses in the recentchanges table
+$wgPutIPinRC = false;
+
 # RDF metadata toggles
 $wgEnableDublinCoreRdf = false;
 $wgEnableCreativeCommonsRdf = false;
@@ -343,6 +352,14 @@ $wgRightsUrl = NULL;
 $wgRightsText = NULL;
 $wgRightsIcon = NULL;
 
+# Set this to true if you want detailed copyright information forms on Upload.
+$wgUseCopyrightUpload = false;
+
+# Set this to false if you want to disable checking that detailed 
+# copyright information values are not empty.
+$wgCheckCopyrightUpload = true;
+
+
 # Set this to false to avoid forcing the first letter of links
 # to capitals. WARNING: may break links! This makes links
 # COMPLETELY case-sensitive. Links appearing with a capital at
@@ -364,6 +381,8 @@ $wgMaxCredits = 0;
 # Text matching this regular expression will be recognised as spam
 # See http://en.wikipedia.org/wiki/Regular_expression
 $wgSpamRegex = false; 
+# Similarly if this function returns true
+$wgFilterCallback = false;
 
 # Go button goes straight to the edit screen if the article doesn't exist
 $wgGoToEdit = false;
@@ -388,8 +407,12 @@ $wgTidyConf = $IP.'/extensions/tidy/tidy.conf';
 $wgTidyOpts = '';
 
 # See list of skins and their symbolic names in language/Language.php
-$wgDefaultSkin = "monobook";
+$wgDefaultSkin = 'monobook';
+
+# Whether or not to allow real name fields. Defaults to true.
+$wgAllowRealName = true;
 
 # Extensions
 $wgExtensionFunctions = array();
+
 ?>