From 0379cc10acbd703521a7b1b4fd37f9df48f988dc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 14 Apr 2016 04:26:52 -0700
Subject: [PATCH] Fixes T10805. When clustering is not configured, this check
 should just return.

Auditors: chad
---
 src/infrastructure/env/PhabricatorEnv.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php
index b53f1c4f05..0ccf9d3a76 100644
--- a/src/infrastructure/env/PhabricatorEnv.php
+++ b/src/infrastructure/env/PhabricatorEnv.php
@@ -782,6 +782,11 @@ final class PhabricatorEnv extends Phobject {
   }
 
   public static function isClusterRemoteAddress() {
+    $cluster_addresses = self::getEnvConfig('cluster.addresses');
+    if (!$cluster_addresses) {
+      return false;
+    }
+
     $address = idx($_SERVER, 'REMOTE_ADDR');
     if (!$address) {
       throw new Exception(