Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove fallback for PHP installs < v5.3.2 as that is now an install requirement

Browse source 
The native stream_resolve_include_path can now be used exclusively

Change-Id: I891fe9e08f5257614dbc966e725c9810423108a5
This commit is contained in:
lwelling 2012-12-10 13:40:01 -05:00
parent 5a7e5d8aca
commit c8cbff08d8
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
includes/Fallback.php
View file

@ -192,22 +192,4 @@ class Fallback {
return false;
}
}
/**
* Fallback implementation of stream_resolve_include_path()
* Native stream_resolve_include_path is available for PHP 5 >= 5.3.2
* @param $filename String
* @return String
*/
public static function stream_resolve_include_path( $filename ) {
$pathArray = explode( PATH_SEPARATOR, get_include_path() );
foreach ( $pathArray as $path ) {
$fullFilename = $path . DIRECTORY_SEPARATOR . $filename;
if ( file_exists( $fullFilename ) ) {
return $fullFilename;
}
}
return false;
}
}

7
includes/UserMailer.php
View file

@ -231,12 +231,7 @@ class UserMailer {
# PEAR MAILER
#
if ( function_exists( 'stream_resolve_include_path' ) ) {
$found = stream_resolve_include_path( 'Mail.php' );
} else {
$found = Fallback::stream_resolve_include_path( 'Mail.php' );
}
if ( !$found ) {
if ( ! stream_resolve_include_path( 'Mail.php' ) ) {
throw new MWException( 'PEAR mail package is not installed' );
}
require_once( 'Mail.php' );