aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/utf
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-10-30 19:51:56 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-10-30 19:51:56 +0000
commit12c75a0991a59eecd274eb2b03476e80ae608eaa (patch)
treeca3acbedd1a8c67f3abb02587dcc2badd46f0189 /phpBB/includes/utf
parentc44f6ca080c944b57dc912de8708e5239c1543a2 (diff)
downloadforums-12c75a0991a59eecd274eb2b03476e80ae608eaa.tar
forums-12c75a0991a59eecd274eb2b03476e80ae608eaa.tar.gz
forums-12c75a0991a59eecd274eb2b03476e80ae608eaa.tar.bz2
forums-12c75a0991a59eecd274eb2b03476e80ae608eaa.tar.xz
forums-12c75a0991a59eecd274eb2b03476e80ae608eaa.zip
- 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
Diffstat (limited to 'phpBB/includes/utf')
-rw-r--r--phpBB/includes/utf/utf_tools.php15
1 files changed, 8 insertions, 7 deletions
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