php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 05:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3591 from advsm/patch-1

Browse Source 
Incomplete obsolete filling in i18n db extractor
This commit is contained in:
Alexander Makarov
2014-05-26 15:09:21 +02:00
parent c6201fb5ca 4bdaa09da0
commit 4b7191be85
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -34,6 +34,7 @@ Yii Framework 2 Change Log
- Bug #3564: Fixed the bug that primary key columns should not take default values from schema (qiangxue) - Bug #3564: Fixed the bug that primary key columns should not take default values from schema (qiangxue)
- Bug #3567: Fixed the bug that smallint was treated as string for PostgreSQL (qiangxue) - Bug #3567: Fixed the bug that smallint was treated as string for PostgreSQL (qiangxue)
- Bug #3578: Fixed postgreSQL column type detection, added missing types (MDMunir, cebe) - Bug #3578: Fixed postgreSQL column type detection, added missing types (MDMunir, cebe)
- Bug #3591: Fix incomplete obsolete filling in i18n `MessageController::saveMessagesToDb()` (advsm)
- Bug: Fixed inconsistent return of `\yii\console\Application::runAction()` (samdark) - Bug: Fixed inconsistent return of `\yii\console\Application::runAction()` (samdark)
- Enh #2264: `CookieCollection::has()` will return false for expired or removed cookies (qiangxue) - Enh #2264: `CookieCollection::has()` will return false for expired or removed cookies (qiangxue)
- Enh #2435: `yii\db\IntegrityException` is now thrown on database integrity errors instead of general `yii\db\Exception` (samdark) - Enh #2435: `yii\db\IntegrityException` is now thrown on database integrity errors instead of general `yii\db\Exception` (samdark)

2
framework/console/controllers/MessageController.php
View File

@@ -173,7 +173,7 @@ class MessageController extends Controller
if (isset($current[$category])) { if (isset($current[$category])) {
$new[$category] = array_diff($msgs, $current[$category]); $new[$category] = array_diff($msgs, $current[$category]);
$obsolete = array_diff($current[$category], $msgs); $obsolete += array_diff($current[$category], $msgs);
} else { } else {
$new[$category] = $msgs; $new[$category] = $msgs;
} }