Add experimental $wgActionPaths config option.

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index bb6bba8..3bf5b54 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -102,6 +102,16 @@ $wgTmpDirectory     = "{$wgUploadDirectory}/tmp";
 $wgUploadBaseUrl    = "";
 /**#@-*/
 
+/**
+ * To set 'pretty' URL paths for actions other than
+ * plain page views, add to this array. For instance:
+ *   'edit' => "$wgScriptPath/edit/$1"
+ *
+ * There must be an appropriate script or rewrite rule
+ * in place to handle these URLs.
+ */
+$wgActionPaths = array();
+
 /**
  * If you operate multiple wikis, you can define a shared upload path here.
  * Uploads to this wiki will NOT be put there - they will be put into
@@ -259,16 +269,6 @@ $wgDBservers               = false;
 /** How long to wait for a slave to catch up to the master */ 
 $wgMasterWaitTimeout = 10;
 
-# Sysop SQL queries
-#   The sql user shouldn't have too many rights other the database, restrict
-#   it to SELECT only on 'page', 'revision' and 'text' tables for example
-#
-/** Dangerous if not configured properly. */
-$wgAllowSysopQueries = false;
-$wgDBsqluser = 'sqluser';
-$wgDBsqlpassword = 'sqlpass';
-$wgDBpassword = 'userpass';
-$wgSqlLogFile = "{$wgUploadDirectory}/sqllog_mFhyRe6";
 /** File to log MySQL errors to */
 $wgDBerrorLog          = false;
 
@@ -286,9 +286,6 @@ $wgDBtransactions   = false;
 $wgDBmysql4                    = false;
 $wgSqlTimeout          = 30;
 
-/** use buffered queries by default */
-$wgBufferSQLResults     = true;
-
 /**
  * Other wikis on this site, can be administered from a single developer
  * account.
@@ -396,7 +393,6 @@ $wgExtraSubtitle    = '';
 $wgSiteSupportPage     = ''; # A page where you users can receive donations
 
 $wgReadOnlyFile         = "{$wgUploadDirectory}/lock_yBgMBwiR";
-$wgUseData = false ;
 
 /**
  * The debug log file should be not be publicly accessible if it is used, as it
@@ -414,9 +410,12 @@ $wgReadOnly             = false;
 $wgLogQueries           = false;
 $wgDebugDumpSql         = false;
 
-/** Whether to disable automatic generation of "we're sorry, but there has been
- * a database error" pages. */
-$wgIgnoreSQLErrors      = false;
+/**
+ * Whether to show "we're sorry, but there has been a database error" pages.
+ * Displaying errors aids in debugging, but may display information useful
+ * to an attacker.
+ */
+$wgShowSQLErrors        = false;
 
 # Should [[Category:Dog]] on a page associate it with the
 # category "Dog"? (a link to that category page will be
@@ -468,8 +467,12 @@ $wgAllowAnonymousMinor = false; # Allow anonymous users to mark changes as 'mino
 
 $wgSysopUserBans        = false; # Allow sysops to ban logged-in users
 $wgSysopRangeBans              = false; # Allow sysops to ban IP ranges
-$wgDefaultBlockExpiry  = '24 hours'; # default expiry time
-                                # strtotime format, or "infinite" for an infinite block
+
+/** Comma-separated list of options to show on the IP block form. 
+  * Use strtotime() format, or "infinite" for an infinite block 
+  */
+$wgBlockExpiryOptions = "2 hours,1 day,3 days,1 week,2 weeks,1 month,3 months,6 months,1 year,infinite";
+
 $wgAutoblockExpiry             = 86400; # Number of seconds before autoblock entries expire
 
 # Proxy scanner settings
@@ -942,12 +945,6 @@ $wgAllowPageInfo = false;
 /** Maximum indent level of toc. */
 $wgMaxTocLevel = 999;
 
-/** Recognise longitude/latitude coordinates */
-$wgUseGeoMode = false;
-
-/** Validation for print or other production versions */
-$wgUseValidation = false;
-
 /** Use external C++ diff engine (module wikidiff from the extensions package) */
 $wgUseExternalDiffEngine = false;
 
@@ -1141,4 +1138,4 @@ $wgMinimalPasswordLength = 0;
 } else {
        die();
 }
-?>
\ No newline at end of file
+?>