diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-08-12 09:28:15 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-08-12 09:28:15 +0200 |
commit | 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 (patch) | |
tree | 577a29fb579188d16003a209ce2a2e9c5b0aa2bd /includes/Fallback.php | |
parent | cacc939b34e315b85e2d72997811eb6677996cc1 (diff) |
Update to MediaWiki 1.21.1
Diffstat (limited to 'includes/Fallback.php')
-rw-r--r-- | includes/Fallback.php | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/includes/Fallback.php b/includes/Fallback.php index 4b138c11..2e19a095 100644 --- a/includes/Fallback.php +++ b/includes/Fallback.php @@ -149,13 +149,12 @@ class Fallback { return $total; } - /** * Fallback implementation of mb_strpos, hardcoded to UTF-8. * @param $haystack String * @param $needle String - * @param $offset String: optional start position - * @param $encoding String: optional encoding; ignored + * @param string $offset optional start position + * @param string $encoding optional encoding; ignored * @return int */ public static function mb_strpos( $haystack, $needle, $offset = 0, $encoding = '' ) { @@ -175,8 +174,8 @@ class Fallback { * Fallback implementation of mb_strrpos, hardcoded to UTF-8. * @param $haystack String * @param $needle String - * @param $offset String: optional start position - * @param $encoding String: optional encoding; ignored + * @param string $offset optional start position + * @param string $encoding optional encoding; ignored * @return int */ public static function mb_strrpos( $haystack, $needle, $offset = 0, $encoding = '' ) { @@ -192,22 +191,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; - } - } |