From 12c75a0991a59eecd274eb2b03476e80ae608eaa Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 30 Oct 2006 19:51:56 +0000 Subject: - temporarily disable x-sendfile support (we need to look into methods of checking if it is enabled/disabled or introducing a switch) - finally allow custom permission settings files (in acp/ as well as in mods/) git-svn-id: file:///svn/phpbb/trunk@6539 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/utf/utf_tools.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'phpBB/includes/utf/utf_tools.php') diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 1f9a698163..24aeb35d02 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -111,16 +111,13 @@ if (extension_loaded('mbstring')) * * Notes: * - offset for mb_strrpos was added in 5.2.0, we emulate if it is lower - * - * @author Harry Fuecks - * @param string haystack - * @param string needle - * @param integer (optional) offset (from left) - * @return mixed integer position or FALSE on failure - * @ignore */ if (version_compare(phpversion(), '5.2.0', '>=')) { + /** + * UTF-8 aware alternative to strrpos + * @ignore + */ function utf8_strrpos($str, $needle, $offset = null) { // Emulate behaviour of strrpos rather than raising warning @@ -134,6 +131,10 @@ if (extension_loaded('mbstring')) } else { + /** + * UTF-8 aware alternative to strrpos + * @ignore + */ function utf8_strrpos($str, $needle, $offset = null) { // offset for mb_strrpos was added in 5.2.0 -- cgit v1.2.1