From eda9fbbb6363cad0f2035b7a1f9fafe27f23832b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 25 Jun 2010 13:31:31 +0200
Subject: [ticket/9574] Remove conditional PHP<5.2 code

There is a large amount of conditional code for PHP < 5.2 that can be
removed with phpBB 3.1.

PHPBB3-9574
---
 phpBB/includes/utf/utf_tools.php | 72 ++++++++--------------------------------
 1 file changed, 14 insertions(+), 58 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 2247315e04..cac5b4e744 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -109,70 +109,26 @@ if (extension_loaded('mbstring'))
 	/**
 	* UTF-8 aware alternative to strrpos
 	* Find position of last occurrence of a char in a string
-	*
-	* Notes:
-	* - offset for mb_strrpos was added in 5.2.0, we emulate if it is lower
 	*/
-	if (version_compare(PHP_VERSION, '5.2.0', '>='))
+	/**
+	* UTF-8 aware alternative to strrpos
+	* @ignore
+	*/
+	function utf8_strrpos($str,	$needle, $offset = null)
 	{
-		/**
-		* UTF-8 aware alternative to strrpos
-		* @ignore
-		*/
-		function utf8_strrpos($str,	$needle, $offset = null)
+		// Emulate behaviour of strrpos rather than raising warning
+		if (empty($str))
 		{
-			// Emulate behaviour of strrpos rather than raising warning
-			if (empty($str))
-			{
-				return false;
-			}
+			return false;
+		}
 
-			if (is_null($offset))
-			{
-				return mb_strrpos($str, $needle);
-			}
-			else
-			{
-				return mb_strrpos($str, $needle, $offset);
-			}
+		if (is_null($offset))
+		{
+			return mb_strrpos($str, $needle);
 		}
-	}
-	else
-	{
-		/**
-		* UTF-8 aware alternative to strrpos
-		* @ignore
-		*/
-		function utf8_strrpos($str,	$needle, $offset = null)
+		else
 		{
-			// offset for mb_strrpos was added in 5.2.0
-			if (is_null($offset))
-			{
-				// Emulate behaviour of strrpos rather than raising warning
-				if (empty($str))
-				{
-					return false;
-				}
-
-				return mb_strrpos($str, $needle);
-			}
-			else
-			{
-				if (!is_int($offset))
-				{
-					trigger_error('utf8_strrpos expects parameter 3 to be long', E_USER_ERROR);
-					return false;
-				}
-
-				$str = mb_substr($str, $offset);
-
-				if (false !== ($pos = mb_strrpos($str, $needle)))
-				{
-					return $pos + $offset;
-				}
-
-				return false;
-			}
+			return mb_strrpos($str, $needle, $offset);
 		}
 	}
 
-- 
cgit v1.2.1