D21464.id51091.diff
No OneTemporary
Actions

Size

877 B

Referenced Files

None

Subscribers

None

D21464.id51091.diff
View Options

	diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	--- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	+++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	@@ -100,9 +100,17 @@
	}
	} catch (Exception $ex) {
	$result = null;
	- $error_code = ($ex instanceof ConduitException
	- ? 'ERR-CONDUIT-CALL'
	- : 'ERR-CONDUIT-CORE');
	+
	+ if ($ex instanceof ConduitException) {
	+ $error_code = 'ERR-CONDUIT-CALL';
	+ } else {
	+ $error_code = 'ERR-CONDUIT-CORE';
	+
	+ // See T13581. When a Conduit method raises an uncaught exception
	+ // other than a "ConduitException", log it.
	+ phlog($ex);
	+ }
	+
	$error_info = $ex->getMessage();
	}