* Removed break in first loop of generateTableHTML(), which caused:

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2c5c248..a4c7cb2 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -26,10 +26,9 @@ if( !defined( 'MEDIAWIKI' ) ) {
        die( 1 );
 }
 
-# Create a site configuration object. Not used for much in a default install
-if ( !defined( 'MW_COMPILED' ) ) {
-       require_once( "$IP/includes/SiteConfiguration.php" );
-}
+# Create a site configuration object. Not used for much in a default install.
+# Note: this (and other things) will break if the autoloader is not enabled. 
+# Please include includes/AutoLoader.php before including this file.
 $wgConf = new SiteConfiguration;
 /** @endcond */
 
@@ -51,36 +50,7 @@ $wgSitename         = 'MediaWiki';
  * wrong server, it will redirect incorrectly after you save a page. In that
  * case, set this variable to fix it.
  */
-$wgServer = '';
-
-/** @cond file_level_code */
-if( isset( $_SERVER['SERVER_NAME'] )
-       # KLUGE: lighttpd 1.4.28 truncates IPv6 addresses at the first colon,
-       # giving bogus hostnames like "[2001"; check for presence of both
-       # brackets to detect this.
-       && ($_SERVER['SERVER_NAME'][0] !== '[' || substr($_SERVER['SERVER_NAME'], -1) === ']')
-       ) {
-       $serverName = $_SERVER['SERVER_NAME'];
-} elseif( isset( $_SERVER['HOSTNAME'] ) ) {
-       $serverName = $_SERVER['HOSTNAME'];
-} elseif( isset( $_SERVER['SERVER_ADDR'] ) ) {
-       $serverName = $_SERVER['SERVER_ADDR'];
-} else {
-       $serverName = 'localhost';
-}
-
-$wgProto = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
-
-$wgServer = $wgProto.'://' . $serverName;
-# If the port is a non-standard one, add it to the URL
-if(    isset( $_SERVER['SERVER_PORT'] )
-       && !strpos( $serverName, ':' )
-       && (    ( $wgProto == 'http' && $_SERVER['SERVER_PORT'] != 80 )
-        || ( $wgProto == 'https' && $_SERVER['SERVER_PORT'] != 443 ) ) ) {
-
-       $wgServer .= ":" . $_SERVER['SERVER_PORT'];
-}
-/** @endcond */
+$wgServer = WebRequest::detectServer();
 
 /************************************************************************//**
  * @name   Script path settings
@@ -986,6 +956,8 @@ $wgDjvuOutputExtension = 'jpg';
  * @{
  */
 
+$serverName = substr( $wgServer, strrpos( $wgServer, '/' ) + 1 );
+
 /**
  * Site admin email address.
  */
@@ -3744,13 +3716,34 @@ $wgCookieExpiration = 30*86400;
  * or ".any.subdomain.net"
  */
 $wgCookieDomain = '';
+
+
+/**
+ * Set this variable if you want to restrict cookies to a certain path within 
+ * the domain specified by $wgCookieDomain.
+ */
 $wgCookiePath = '/';
-$wgCookieSecure = ($wgProto == 'https');
+
+/**
+ * Whether the "secure" flag should be set on the cookie. This can be:
+ *   - true:      Set secure flag
+ *   - false:     Don't set secure flag
+ *   - "detect":  Set the secure flag if $wgServer is set to an HTTPS URL
+ */
+$wgCookieSecure = 'detect';
+
+/**
+ * By default, MediaWiki checks if the client supports cookies during the 
+ * login process, so that it can display an informative error message if 
+ * cookies are disabled. Set this to true if you want to disable this cookie
+ * check.
+ */
 $wgDisableCookieCheck = false;
 
 /**
- * Set $wgCookiePrefix to use a custom one. Setting to false sets the default of
- * using the database name.
+ * Cookies generated by MediaWiki have names starting with this prefix. Set it
+ * to a string to use a custom prefix. Setting it to false causes the database
+ * name to be used as a prefix.
  */
 $wgCookiePrefix = false;
 
@@ -5026,8 +5019,11 @@ $wgMaxRedirectLinksRetrieved = 500;
  */
 $wgActions = array(
        'credits' => true,
-       'revisiondelete' => true,
+       'deletetrackback' => true,
+       'info' => true,
+       'markpatrolled' => true,
        'purge' => true,
+       'revisiondelete' => true,
        'unwatch' => true,
        'watch' => true,
 );