From 6df35c2cb6895fedee6a85645b369bff52c25670 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 22 Jun 2010 14:10:34 +0200
Subject: [PATCH] [ticket/9669] Make sure normalize_nfc returns string

Normalizer::normalize can return null, cast to a string.

PHPBB3-9669
---
 phpBB/includes/utf/utf_tools.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index 4cc0486e91..34f9633677 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -1782,7 +1782,7 @@ else
 			{
 				return $strings;
 			}
-			return Normalizer::normalize($strings);
+			return (string) Normalizer::normalize($strings);
 		}
 		else
 		{
@@ -1796,7 +1796,7 @@ else
 						{
 							continue;
 						}
-						$strings[$key][$_key] = Normalizer::normalize($strings[$key][$_key]);
+						$strings[$key][$_key] = (string) Normalizer::normalize($strings[$key][$_key]);
 					}
 				}
 				else
@@ -1805,7 +1805,7 @@ else
 					{
 						continue;
 					}
-					$strings[$key] = Normalizer::normalize($strings[$key]);
+					$strings[$key] = (string) Normalizer::normalize($strings[$key]);
 				}
 			}
 		}