revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 08:42:41 +01:00
Code Issues Releases Wiki Activity

Fix argument ordering in error message

Browse source 
Summary:
Before:
```
$ ./config set phabricator.base-uri local.phacility.com:8080
Usage Exception: Config option 'http://' is invalid. The URI must start with https://' or 'phabricator.base-uri'.
```
After:
```
$ ./config set phabricator.base-uri local.phacility.com:8080
Usage Exception: Config option 'phabricator.base-uri' is invalid. The URI must start with http://' or 'https://'.
```

Test Plan: See above

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19330
This commit is contained in:
Austin McKinley 2018-04-10 09:57:13 -07:00
parent 4c4a5a7656
commit d398bcd67c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/applications/config/option/PhabricatorCoreConfigOptions.php
View file

@ -268,24 +268,24 @@ EOREMARKUP
if ($protocol !== 'http' && $protocol !== 'https') { if ($protocol !== 'http' && $protocol !== 'https') {
throw new PhabricatorConfigValidationException( throw new PhabricatorConfigValidationException(
pht( pht(
"Config option '%s' is invalid. The URI must start with ". 'Config option "%s" is invalid. The URI must start with '.
"%s' or '%s'.", '"%s" or "%s".',
$key,
'http://', 'http://',
'https://', 'https://'));
$key));
} }
$domain = $uri->getDomain(); $domain = $uri->getDomain();
if (strpos($domain, '.') === false) { if (strpos($domain, '.') === false) {
throw new PhabricatorConfigValidationException( throw new PhabricatorConfigValidationException(
pht( pht(
"Config option '%s' is invalid. The URI must contain a dot ". 'Config option "%s" is invalid. The URI must contain a dot '.
"('%s'), like '%s', not just a bare name like '%s'. Some web ". '("%s"), like "%s", not just a bare name like "%s". Some web '.
"browsers will not set cookies on domains with no TLD.", 'browsers will not set cookies on domains with no TLD.',
$key,
'.', '.',
'http://example.com/', 'http://example.com/',
'http://example/', 'http://example/'));
$key));
} }
$path = $uri->getPath(); $path = $uri->getPath();