From d1663a5fb7b03f64e49472eff4bc43a4ad0676e2 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 26 Mar 2014 17:51:19 +0100
Subject: [PATCH] fixed potential problem with MessageFormatter and broken
 messages

---
 framework/i18n/MessageFormatter.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/i18n/MessageFormatter.php b/framework/i18n/MessageFormatter.php
index 0708f694c5..893322f789 100644
--- a/framework/i18n/MessageFormatter.php
+++ b/framework/i18n/MessageFormatter.php
@@ -220,7 +220,9 @@ class MessageFormatter extends Component
                 if (!isset($token[2])) {
                     return false;
                 }
-                $subtokens = self::tokenizePattern($token[2]);
+                if (($subtokens = self::tokenizePattern($token[2])) === false) {
+                    return false;
+                }
                 $c = count($subtokens);
                 for ($k = 0; $k + 1 < $c; $k++) {
                     if (is_array($subtokens[$k]) || !is_array($subtokens[++$k])) {