phptal doesn't require ini_set anymore

diff --git a/config/index.php b/config/index.php
index a883d49..907856a 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -237,11 +237,6 @@ $conf->IP = preg_replace( "/\\\\/","\\\\\\\\",$conf->IP );  // For Windows, \ ->
 chdir( "config" );
 print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt></li>\n";
 
-@$oldpath = ini_set( "include_path", ini_get( "include_path" ) );
-if( empty( $oldpath ) ) {
-       print "<li>Can't set <tt>include_path</tt>; new template layout will be disabled.</li>\n";
-}
-
 # $conf->ScriptPath = "/~brion/inplace";
 $conf->ScriptPath = preg_replace( '{^(.*)/config.*$}', '$1', $_SERVER["REQUEST_URI"] );
 print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</tt></li>\n";

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a9383a1..e1fc890 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -318,16 +318,7 @@ $wgUseImageResize          = false;
 $wgUseImageMagick              = false;
 $wgImageMagickConvertCommand    = "/usr/bin/convert";
 
-# PHPTal needs a PEAR directory in the include_path. If we can't change the
-# include_path (such as on free.fr and other hosts) we may have to disable it.
 $wgUsePHPTal = true;
-$pathchange = @ini_set( "include_path", "PHPTAL-NP-0.7.0/libs:" . ini_get("include_path") );
-if( empty( $pathchange ) ) {
-       # Can't fix path! User can manually enable it again if they put the files
-       # in an appropriate place.
-       $wgUsePHPTal = false;
-}
-
 
 if( !isset( $wgCommandLineMode ) ) {
        $wgCommandLineMode = false;