Merge branch 'master' into raise-php-version

yiisoft · Oct 6, 2023 · cee4222 · cee4222
2 parents 826a0f2 + 53f1619
commit cee4222
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/docs/guide-ru/concept-di-container.md b/docs/guide-ru/concept-di-container.md
@@ -498,7 +498,7 @@ class HotelController extends Controller
 как можно раньше. Ниже приведены рекомендуемые практики:
 
 * Если вы разработчик приложения, то вы можете зарегистрировать зависимости в конфигурации вашего приложения.
-  Как это сделать описано в подразделе [Конфигурация приложения](concept-service-locator.md#application-configurations) 
+  Как это сделать описано в подразделе [Конфигурация приложения](concept-configurations.md#application-configurations) 
   раздела [Конфигурации](concept-configurations.md).
 * Если вы разработчик распространяемого [расширения](structure-extensions.md), то вы можете зарегистрировать зависимости
   в загрузочном классе расширения.

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -5,11 +5,18 @@ Yii Framework 2 Change Log
 ------------------------
 
 - Bug #19925: Improved PHP version check when handling MIME types (schmunk42)
+
+
+2.0.49.1 October 05, 2023
+-------------------------
+
 - Bug #19940: File Log writer without newline (terabytesoftw)
-- Bug #19951: Removed unneeded MIME file tests (schmunk42)
 - Bug #19950: Fix `Query::groupBy(null)` causes error for PHP 8.1: `trim(): Passing null to parameter #1 ($string) of type string is deprecated` (uaoleg)
+- Bug #19951: Removed unneeded MIME file tests (schmunk42)
+- Bug #19984: Do not duplicate log messages in memory (lubosdz)
 - Enh #19780: added pcntl to requirements check (schmunk42)
 
+
 2.0.49 August 29, 2023
 ----------------------
 

diff --git a/framework/log/FileTarget.php b/framework/log/FileTarget.php
@@ -107,9 +107,8 @@ public function init()
     public function export()
     {
         $text = implode("\n", array_map([$this, 'formatMessage'], $this->messages)) . "\n";
-        $trimmedText = trim($text);
 
-        if (empty($trimmedText)) {
+        if (trim($text) === '') {
             return; // No messages to export, so we exit the function early
         }
 

diff --git a/framework/messages/ko/yii.php b/framework/messages/ko/yii.php
@@ -75,8 +75,8 @@
     '{attribute} must be greater than or equal to "{compareValue}".' => '{attribute}는 "{compareValue}" 보다 크거나 같아야 합니다.',
     '{attribute} must be less than "{compareValue}".' => '{attribute}는 "{compareValue}" 보다 작아야 합니다.',
     '{attribute} must be less than or equal to "{compareValue}".' => '{attribute}는 "{compareValue}" 보다 작거나 같아야 합니다.',
-    '{attribute} must be no greater than {max}.' => '{attribute}는 "{compareValue}" 보다 클 수 없습니다.',
-    '{attribute} must be no less than {min}.' => '{attribute}는 "{compareValue}" 보다 작을 수 없습니다.',
+    '{attribute} must be no greater than {max}.' => '{attribute}는 "{max}" 보다 클 수 없습니다.',
+    '{attribute} must be no less than {min}.' => '{attribute}는 "{min}" 보다 작을 수 없습니다.',
     '{attribute} must be repeated exactly.' => '{attribute}는 정확하게 반복합니다.',
     '{attribute} must not be equal to "{compareValue}".' => '{attribute}는 "{compareValue}"와 같을 수 없습니다.',
     '{attribute} should contain at least {min, number} {min, plural, one{character} other{characters}}.' => '{attribute}는 최소 {min}자 이어야합니다.',