Skip to content

Commit 560baa7

Browse files
committed
Merge branch '1.7'
2 parents 5d7dfad + b8d112b commit 560baa7

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
99
- Improve TranslateBehavior saving #99
1010
The attribute is now saved as translation when the language of the application is different from the source language.
1111

12+
## [1.7.3] - 2018-04-04
13+
### Fixed
14+
- Fix invalid column name in findOne() condition #118
15+
1216
## [1.7.2] - 2018-02-23
1317
### Minor
1418
- Restrict version constraints for Yii dependencies in composer.json #116
@@ -87,7 +91,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
8791
### Fixed
8892
- Round error in translation statistic
8993

90-
[Unreleased]: https://github.com/lajax/yii2-translate-manager/compare/1.7.2...HEAD
94+
[Unreleased]: https://github.com/lajax/yii2-translate-manager/compare/1.7.3...HEAD
95+
[1.7.3]: https://github.com/lajax/yii2-translate-manager/compare/1.7.2...1.7.3
9196
[1.7.2]: https://github.com/lajax/yii2-translate-manager/compare/1.7.1...1.7.2
9297
[1.7.1]: https://github.com/lajax/yii2-translate-manager/compare/1.7.0...1.7.1
9398
[1.7.0]: https://github.com/lajax/yii2-translate-manager/compare/1.6.0...1.7.0

controllers/actions/DialogAction.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ class DialogAction extends \yii\base\Action
2222
*/
2323
public function run()
2424
{
25-
$languageSource = LanguageSource::findOne([
25+
$languageSource = LanguageSource::find()->where([
2626
'category' => Yii::$app->request->post('category', ''),
2727
'MD5(message)' => Yii::$app->request->post('hash', ''),
28-
]);
28+
])->one();
2929

3030
if (!$languageSource) {
3131
return '<div id="translate-manager-error">' . Yii::t('language', 'Text not found in database! Please run project scan before translating!') . '</div>';

0 commit comments

Comments
 (0)