Further cleanup of index.php

[lhc/web/wiklou.git] / config / index.php

diff --git a/config/index.php b/config/index.php
index 17a3c72..12c38ba 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -30,7 +30,7 @@ header( "Content-type: text/html; charset=utf-8" );
        <title>MediaWiki installation</title>
        <style type="text/css">
 
-               @import "../skins/monobook/main.css"; 
+               @import "../skins/monobook/main.css";
 
                .env-check {
                        font-size: 90%;
@@ -987,7 +987,7 @@ if( count( $errs ) ) {
 
                <p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p>
        </div>
-       
+
        <div class="config-input"><label class="column">Database charset</label>
                <div>Select one:</div>
                <ul class="plain">
@@ -1144,7 +1144,9 @@ function writeLocalSettings( $conf ) {
 # file, not there.
 
 \$IP = \"{$slconf['IP']}\";
-ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" );
+if( !ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" ) ) {
+       set_include_path( \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" );
+}
 require_once( \"includes/DefaultSettings.php\" );
 
 # If PHP's memory limit is very low, some operations may fail.
@@ -1279,7 +1281,7 @@ function importRequest( $name, $default = "" ) {
 $radioCount = 0;
 
 function aField( &$conf, $field, $text, $type = "text", $value = "" ) {
-       global $radioCount; 
+       global $radioCount;
        if( $type != "" ) {
                $xtype = "type=\"$type\"";
        } else {
@@ -1288,10 +1290,10 @@ function aField( &$conf, $field, $text, $type = "text", $value = "" ) {
 
        if(!(isset($id)) or ($id == "") ) $id = $field;
        $nolabel = ($type == "radio") || ($type == "hidden");
-       
+
        if ($type == 'radio')
                $id .= $radioCount++;
-       
+
        if( $nolabel ) {
                echo "\t\t<label>";
        } else {
@@ -1460,7 +1462,7 @@ function testMemcachedServer( $server ) {
                        <li><a href="http://meta.wikipedia.org/wiki/MediaWiki_User's_Guide">User's Guide</a></li>
                        <li><a href="http://meta.wikimedia.org/wiki/MediaWiki_FAQ">FAQ</a></li>
                </ul>
-               <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright &copy; 2001-2005 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
+               <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright &copy; 2001-2006 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
        </div></div>
 </div>