4 files changed, 7 insertions, 21 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 6278c129a4..e22833c8bf 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -122,12 +122,12 @@ class acp_bbcodes
 				{
 					$sql = 'SELECT 1 as test
 						FROM ' . BBCODES_TABLE . "
-						WHERE LOWER(bbcode_tag) = '" . $db->sql_escape(utf8_strtolower($data['bbcode_tag'])) . "'";
+						WHERE LOWER(bbcode_tag) = '" . $db->sql_escape(strtolower($data['bbcode_tag'])) . "'";
 					$result = $db->sql_query($sql);
 					$info = $db->sql_fetchrow($result);
 					$db->sql_freeresult($result);
 
-					if ($info['test'] === '1' || in_array(utf8_strtolower($data['bbcode_tag']), $hard_coded))
+					if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded))
 					{
 						trigger_error($user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING);
 					}
@@ -358,10 +358,10 @@ class acp_bbcodes
 
 		// Lowercase tags
 		$bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+=?).*/i', '$1', $bbcode_match);
-		$fp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "utf8_strtolower('\$0')", $fp_match);
-		$fp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "utf8_strtolower('\$0')", $fp_replace);
-		$sp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "utf8_strtolower('\$0')", $sp_match);
-		$sp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "utf8_strtolower('\$0')", $sp_replace);
+		$fp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $fp_match);
+		$fp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $fp_replace);
+		$sp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $sp_match);
+		$sp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $sp_replace);
 
 		return array(
 			'bbcode_tag'				=> $bbcode_tag,
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 0e16bfd10b..732ecdfed6 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -425,7 +425,7 @@ class dbal
 				$this->sql_transaction('rollback');
 			}
 
-			if (utf8_strlen($message) > 1024)
+			if (strlen($message) > 1024)
 			{
 				// We need to define $msg_long_text here to circumvent text stripping.
 				global $msg_long_text;
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 1fa32f4290..3407a2f238 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -447,12 +447,6 @@ function compose_pm($id, $mode, $action)
 	if ($submit || $preview || $refresh)
 	{
 		$subject = request_var('subject', '', true);
-
-		if ($subject && strcmp($subject, utf8_strtoupper($subject)) === 0)
-		{
-			$subject = utf8_strtolower($subject);
-		}
-
 		$message_parser->message = request_var('message', '', true);
 
 		$icon_id			= request_var('icon', 0);
diff --git a/phpBB/posting.php b/phpBB/posting.php
index b8f50d657d..f6941369a7 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -529,14 +529,6 @@ if ($submit || $preview || $refresh)
 {
 	$post_data['topic_cur_post_id'] = request_var('topic_cur_post_id', 0);
 	$post_data['post_subject'] = request_var('subject', '', true);
-
-	// If subject is all-uppercase then we make all lowercase (we do not want to be yelled at too :P)
-	// Admins/Mods might want to create all-uppercase topics, therefore we do not apply this check to them (they should know better ;))
-	if ($post_data['post_subject'] && !$auth->acl_gets('a_', 'm_', $forum_id) && strcmp($post_data['post_subject'], utf8_strtoupper($post_data['post_subject'])) === 0)
-	{
-		$post_data['post_subject'] = utf8_strtolower($post_data['post_subject']);
-	}
-
 	$message_parser->message = request_var('message', '', true);
 
 	$post_data['username']			= request_var('username', $post_data['username']);