From ad9af106ee08e23f24a2104b38a644fd73128f0c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Jan 2015 12:39:58 -0800
Subject: [PATCH] Check policy.locked slightly sooner in PhabricatorApplication

Summary: We could still miss this if the policy had never been customized and we returned early after one of the other checks.

Test Plan:
Works great on instances now.

{F267067}

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D11374
---
 src/applications/base/PhabricatorApplication.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index fdded7fd25..83986cc5b2 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -442,6 +442,11 @@ abstract class PhabricatorApplication implements PhabricatorPolicyInterface {
       return null;
     }
 
+    $policy_locked = PhabricatorEnv::getEnvConfig('policy.locked');
+    if (isset($policy_locked[$capability])) {
+      return $policy_locked[$capability];
+    }
+
     $config = PhabricatorEnv::getEnvConfig('phabricator.application-settings');
 
     $app = idx($config, $this->getPHID());
@@ -454,11 +459,6 @@ abstract class PhabricatorApplication implements PhabricatorPolicyInterface {
       return null;
     }
 
-    $policy_locked = PhabricatorEnv::getEnvConfig('policy.locked');
-    if (isset($policy_locked[$capability])) {
-      return $policy_locked[$capability];
-    }
-
     return idx($policy, $capability);
   }