D11424.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11424.id.diff
View Options

	diff --git a/src/applications/notification/client/PhabricatorNotificationClient.php b/src/applications/notification/client/PhabricatorNotificationClient.php
	--- a/src/applications/notification/client/PhabricatorNotificationClient.php
	+++ b/src/applications/notification/client/PhabricatorNotificationClient.php
	@@ -6,15 +6,14 @@

	public static function getServerStatus() {
	$uri = PhabricatorEnv::getEnvConfig('notification.server-uri');
	- $uri = new PhutilURI($uri);
	-
	- $uri->setPath('/status/');
	+ $uri = id(new PhutilURI($uri))
	+ ->setPath('/status/');

	list($body) = id(new HTTPSFuture($uri))
	->setTimeout(3)
	->resolvex();

	- $status = json_decode($body, true);
	+ $status = phutil_json_decode($body);
	if (!is_array($status)) {
	throw new Exception(
	pht(
	diff --git a/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php b/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php
	--- a/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php
	+++ b/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php
	@@ -37,8 +37,8 @@
	->addRelatedPhabricatorConfig('notification.server-uri')
	->addCommand(
	pht(
	- "(To start the server, run this command.)\n".
	- "phabricator/ $ ./bin/aphlict start"));
	+ "(To start the server, run this command.)\n%s",
	+ 'phabricator/ $ ./bin/aphlict start'));

	return;
	}