php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 23:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes PHP 5.5 weird placeholder replacememt in case no arguments are provided at all (https://bugs.php.net/bug.php?id=65920).

Browse Source
This commit is contained in:
Alexander Makarov
2013-10-17 00:36:48 +04:00
parent 677893eb79
commit cdb9fbf679
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/yii/i18n/MessageFormatter.php
View File

@@ -13,6 +13,7 @@ namespace yii\i18n;
* - Accepts named arguments and mixed numeric and named arguments. * - Accepts named arguments and mixed numeric and named arguments.
* - Issues no error when an insufficient number of arguments have been provided. Instead, the placeholders will not be * - Issues no error when an insufficient number of arguments have been provided. Instead, the placeholders will not be
* substituted. * substituted.
* - Fixes PHP 5.5 weird placeholder replacememt in case no arguments are provided at all (https://bugs.php.net/bug.php?id=65920).
* *
* @author Alexander Makarov <sam@rmcreative.ru> * @author Alexander Makarov <sam@rmcreative.ru>
* @author Carsten Brandt <mail@cebe.cc> * @author Carsten Brandt <mail@cebe.cc>
@@ -29,6 +30,10 @@ class MessageFormatter extends \MessageFormatter
*/ */
public function format($args) public function format($args)
{ {
if ($args === array()) {
return $this->getPattern();
}
if (self::needFix()) { if (self::needFix()) {
$pattern = self::replaceNamedArguments($this->getPattern(), $args); $pattern = self::replaceNamedArguments($this->getPattern(), $args);
$this->setPattern($pattern); $this->setPattern($pattern);
@@ -48,6 +53,10 @@ class MessageFormatter extends \MessageFormatter
*/ */
public static function formatMessage($locale, $pattern, $args) public static function formatMessage($locale, $pattern, $args)
{ {
if ($args === array()) {
return $pattern;
}
if (self::needFix()) { if (self::needFix()) {
$pattern = self::replaceNamedArguments($pattern, $args); $pattern = self::replaceNamedArguments($pattern, $args);
$args = array_values($args); $args = array_values($args);