Merged my changes from REL1_4

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4bada21..c048965 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -19,7 +19,7 @@ if( defined( 'MEDIAWIKI' ) ) {
  * MediaWiki version number
  * @global string $wgVersion
  */
-$wgVersion                     = '1.5alpha';
+$wgVersion                     = '1.5pre-alpha';
 
 /** 
  * Name of the site.
@@ -367,9 +367,11 @@ $wgPartialMessageCache = false;
 # supports this function, to convert between Traditional and Simplified
 # Chinese. This flag is meant to isolate the (untested) conversion 
 # code, so that if it breaks, only zh will be affected
-$wgDisableLangConversion = true;
+$wgDisableLangConversion = false;
 
 # Whether to use zhdaemon to perform Chinese text processing
+# zhdaemon is under developement, so normally you don't want to
+# use it unless for testing
 $wgUseZhdaemon = false;
 $wgZhdaemonHost="localhost";
 $wgZhdaemonPort=2004;
@@ -956,6 +958,7 @@ $wgForceUIMsgAsContentMsg = array( 'mainpage', 'portal-url' );
 */
 $wgForceUIMsgAsContentMsg = array();
 
+
 /**
  * Authentication plugin.
  */
@@ -972,7 +975,21 @@ $wgAuth = null;
  */
        
 $wgHooks = array();
-       
+
+/**
+ * Experimental preview feature to fetch rendered text
+ * over an XMLHttpRequest from JavaScript instead of
+ * forcing a submit and reload of the whole page.
+ * Leave disabled unless you're testing it.
+ */
+$wgLivePreview = false;
+
+/**
+ * Disable the internal MySQL-based search, to allow it to be
+ * implemented by an extension instead.
+ */
+$wgDisableInternalSearch = false;
+
 } else {
        die();
 }