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

The native stream_resolve_include_path can now be used exclusively

Change-Id: I891fe9e08f5257614dbc966e725c9810423108a5

diff --git a/includes/Fallback.php b/includes/Fallback.php
index 4b138c1..b517656 100644 (file)
--- a/includes/Fallback.php
+++ b/includes/Fallback.php
@@ -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;
-       }
-
 }

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 66c70b3..b8b6aa8 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -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' );