D25394.1737816688.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D25394.1737816688.diff
View Options

	diff --git a/src/applications/config/check/PhabricatorWebServerSetupCheck.php b/src/applications/config/check/PhabricatorWebServerSetupCheck.php
	--- a/src/applications/config/check/PhabricatorWebServerSetupCheck.php
	+++ b/src/applications/config/check/PhabricatorWebServerSetupCheck.php
	@@ -23,7 +23,7 @@
	}

	$base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
	- if (!strlen($base_uri)) {
	+ if (!phutil_nonempty_string($base_uri)) {
	// If `phabricator.base-uri` is not set then we can't really do
	// anything.
	return;
	diff --git a/src/applications/notification/client/PhabricatorNotificationServerRef.php b/src/applications/notification/client/PhabricatorNotificationServerRef.php
	--- a/src/applications/notification/client/PhabricatorNotificationServerRef.php
	+++ b/src/applications/notification/client/PhabricatorNotificationServerRef.php
	@@ -144,7 +144,9 @@
	}

	public function getURI($to_path = null) {
	- $full_path = rtrim($this->getPath(), '/').'/'.ltrim($to_path, '/');
	+ $path = coalesce($this->path, '');
	+ $to_path = coalesce($to_path, '');
	+ $full_path = rtrim($path, '/').'/'.ltrim($to_path, '/');

	$uri = id(new PhutilURI('http://'.$this->getHost()))
	->setProtocol($this->getProtocol())