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

Merge branch 'master' of github.com:facebook/phabricator

Browse source
This commit is contained in:
epriestley 2011-03-07 18:28:51 -08:00
commit 0bcbd0f158
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
View file

@ -91,7 +91,11 @@ class PhabricatorConduitAPIController
$auth_okay = false; $auth_okay = false;
$error_code = 'ERR-NO-CERTIFICATE'; $error_code = 'ERR-NO-CERTIFICATE';
$error_info = "This server requires authentication but your client ". $error_info = "This server requires authentication but your client ".
"is not configured with an authentication certificate."; "is not configured with an authentication ".
"certificate. Please refer to ".
"page http://www.phabricator.com/docs/".
"phabricator/article/".
"Installing_Arcanist_Certificates.html for more info.";
} else { } else {
$user = new PhabricatorUser(); $user = new PhabricatorUser();
$session = queryfx_one( $session = queryfx_one(

4
src/applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php
View file

@ -63,7 +63,9 @@ class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod {
"you're executing a replay attack.", "you're executing a replay attack.",
"ERR-NO-CERTIFICATE" => "ERR-NO-CERTIFICATE" =>
"This server requires authentication but your client is not ". "This server requires authentication but your client is not ".
"configured with an authentication certificate." "configured with an authentication certificate. Please refer to page ".
"http://www.phabricator.com/docs/phabricator/article/".
"Installing_Arcanist_Certificates.html for more info."
); );
} }