php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-12-16 03:28:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimized checks order in conditions

Browse Source
This commit is contained in:
Alexander Makarov
2015-02-08 17:46:19 +03:00
parent af7ae33d5b
commit 6481d13494
19 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -398,7 +398,7 @@ class MessageController extends Controller
}
ksort($existingMessages);
foreach ($existingMessages as $message => $translation) {
if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeUnused) {
if (!$removeUnused && !isset($merged[$message]) && !isset($todo[$message])) {
if (!empty($translation) && strncmp($translation, '@@', 2) === 0 && substr_compare($translation, '@@', -2, 2) === 0) {
$todo[$message] = $translation;
} else {
@@ -512,7 +512,7 @@ EOD;
// add obsolete unused messages
foreach ($existingMessages as $message => $translation) {
if (!isset($merged[$category . chr(4) . $message]) && !isset($todos[$category . chr(4) . $message]) && !$removeUnused) {
if (!$removeUnused && !isset($merged[$category . chr(4) . $message]) && !isset($todos[$category . chr(4) . $message])) {
if (!empty($translation) && substr($translation, 0, 2) === '@@' && substr($translation, -2) === '@@') {
$todos[$category . chr(4) . $message] = $translation;
} else {