From bbd225437f8eb558edd78b3c2a483a016f61fabd Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Sat, 20 Jun 2009 20:28:59 +0200 Subject: [PATCH] [svn r21539] FS#306 - The multi-bute string library: Removing recently introduced functions api_strcasercmp(), api_strrcmp(), api_strnatcasercmp(), api_strnatrcmp(). They have no chance to be useful. --- .../lib/multibyte_string_functions.lib.php | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/main/inc/lib/multibyte_string_functions.lib.php b/main/inc/lib/multibyte_string_functions.lib.php index 0aa500ccab..af3159f831 100644 --- a/main/inc/lib/multibyte_string_functions.lib.php +++ b/main/inc/lib/multibyte_string_functions.lib.php @@ -1041,18 +1041,6 @@ function api_strcasecmp($string1, $string2, $language = null, $encoding = null) return api_strcmp(api_strtolower($string1, $encoding), api_strtolower($string2, $encoding), $language, $encoding); } -/** - * Performs reverse string comparison, case insensitive, language sensitive, with extended multibyte support. - * @param string $string1 The first string. - * @param string $string2 The second string. - * @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then. - * @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default. - * @return int Returns < 0 if $string2 is less than $string1; > 0 if $string2 is greater than $string1; and 0 if the strings are equal. - */ -function api_strcasercmp($string1, $string2, $language = null, $encoding = null) { - return api_strcasecmp($string2, $string1, $language, $encoding); -} - /** * Performs string comparison, case sensitive, language sensitive, with extended multibyte support. * @param string $string1 The first string. @@ -1075,18 +1063,6 @@ function api_strcmp($string1, $string2, $language = null, $encoding = null) { return strcmp($string1, $string2); } -/** - * Performs reverse string comparison, case sensitive, language sensitive, with extended multibyte support. - * @param string $string1 The first string. - * @param string $string2 The second string. - * @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then. - * @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default. - * @return int Returns < 0 if $string2 is less than $string1; > 0 if $string2 is greater than $string1; and 0 if the strings are equal. - */ -function api_strrcmp($string1, $string2, $language = null, $encoding = null) { - return api_strcmp($string2, $string1, $language, $encoding); -} - /** * Performs string comparison in so called "natural order", case insensitive, language sensitive, with extended multibyte support. * @param string $string1 The first string. @@ -1101,18 +1077,6 @@ function api_strnatcasecmp($string1, $string2, $language = null, $encoding = nul return api_strnatcmp(api_strtolower($string1, $encoding), api_strtolower($string2, $encoding), $language, $encoding); } -/** - * Performs reverse string comparison in so called "natural order", case insensitive, language sensitive, with extended multibyte support. - * @param string $string1 The first string. - * @param string $string2 The second string. - * @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then. - * @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default. - * @return int Returns < 0 if $string2 is less than $string1; > 0 if $string2 is greater than $string1; and 0 if the strings are equal. - */ -function api_strnatcasercmp($string1, $string2, $language = null, $encoding = null) { - return api_strnatcmp(api_strtolower($string2, $encoding), api_strtolower($string1, $encoding), $language, $encoding); -} - /** * Performs string comparison in so called "natural order", case sensitive, language sensitive, with extended multibyte support. * @param string $string1 The first string. @@ -1135,18 +1099,6 @@ function api_strnatcmp($string1, $string2, $language = null, $encoding = null) { return strnatcmp($string1, $string2); } -/** - * Performs reverse string comparison in so called "natural order", case sensitive, language sensitive, with extended multibyte support. - * @param string $string1 The first string. - * @param string $string2 The second string. - * @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then. - * @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default. - * @return int Returns < 0 if $string2 is less than $string1; > 0 if $string2 is greater than $string1; and 0 if the strings are equal. - */ -function api_strnatrcmp($string1, $string2, $language = null, $encoding = null) { - return api_strnatcmp($string2, $string1, $language, $encoding); -} - /** * Checks if a value exists in an array, a case insensitive version of in_array() function with extended multibyte support. * @param mixed $needle The searched value. If needle is a string, the comparison is done in a case-insensitive manner.