diff options
Diffstat (limited to 'cli')
| -rwxr-xr-x | cli/create-user.php | 4 | ||||
| -rwxr-xr-x | cli/delete-user.php | 2 | ||||
| -rw-r--r-- | cli/i18n/I18nUsageValidator.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cli/create-user.php b/cli/create-user.php index 27e27f7a1..1da7f580d 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -10,7 +10,7 @@ if (!FreshRSS_user_Controller::checkUsername($username)) { } $usernames = listUsers(); -if (preg_grep("/^$username$/i", $usernames)) { +if (preg_grep("/^$username$/i", $usernames) !== false) { fail('FreshRSS warning: username already exists “' . $username . '”', EXIT_CODE_ALREADY_EXISTS); } @@ -31,7 +31,7 @@ if (!$ok) { if (!empty($options['api_password'])) { $username = cliInitUser($username); $error = FreshRSS_api_Controller::updatePassword($options['api_password']); - if ($error) { + if ($error !== false) { fail($error); } } diff --git a/cli/delete-user.php b/cli/delete-user.php index fbbb2eebb..7b05cbe7a 100755 --- a/cli/delete-user.php +++ b/cli/delete-user.php @@ -19,7 +19,7 @@ if (!FreshRSS_user_Controller::checkUsername($username)) { } $usernames = listUsers(); -if (!preg_grep("/^$username$/i", $usernames)) { +if (preg_grep("/^$username$/i", $usernames) === false) { fail('FreshRSS error: username not found “' . $username . '”'); } diff --git a/cli/i18n/I18nUsageValidator.php b/cli/i18n/I18nUsageValidator.php index 0d85077f0..f8e3c6051 100644 --- a/cli/i18n/I18nUsageValidator.php +++ b/cli/i18n/I18nUsageValidator.php @@ -42,7 +42,7 @@ class I18nUsageValidator implements I18nValidatorInterface { foreach ($this->reference as $file => $data) { foreach ($data as $key => $value) { $this->totalEntries++; - if (preg_match('/\._$/', $key) && in_array(preg_replace('/\._$/', '', $key), $this->code, true)) { + if (preg_match('/\._$/', $key) === 1 && in_array(preg_replace('/\._$/', '', $key), $this->code, true)) { continue; } if (!in_array($key, $this->code, true)) { |