@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
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
+5
-5
+5
-5
src/applications/base/PhabricatorApplication.php
+5
-5
src/applications/base/PhabricatorApplication.php
···
442
442
return null;
443
443
}
444
444
445
+
$policy_locked = PhabricatorEnv::getEnvConfig('policy.locked');
446
+
if (isset($policy_locked[$capability])) {
447
+
return $policy_locked[$capability];
448
+
}
449
+
445
450
$config = PhabricatorEnv::getEnvConfig('phabricator.application-settings');
446
451
447
452
$app = idx($config, $this->getPHID());
···
452
457
$policy = idx($app, 'policy');
453
458
if (!$policy) {
454
459
return null;
455
-
}
456
-
457
-
$policy_locked = PhabricatorEnv::getEnvConfig('policy.locked');
458
-
if (isset($policy_locked[$capability])) {
459
-
return $policy_locked[$capability];
460
460
}
461
461
462
462
return idx($policy, $capability);