Page MenuHomePhabricator
Files F15385948

D10643.id25558.diff
No OneTemporary
Actions

D10643.id25558.diff
View Options

diff --git a/conf/__init_conf__.php b/conf/__init_conf__.php
--- a/conf/__init_conf__.php
+++ b/conf/__init_conf__.php
@@ -8,6 +8,43 @@
$config = preg_replace('/\.conf\.php$/', '', $original_config);
$full_config_path = $root.'/conf/'.$config.'.conf.php';
+ if (!Filesystem::pathExists($full_config_path)) {
+
+ // These are very old configuration files which we used to ship with
+ // by default. File based configuration was de-emphasized once web-based
+ // configuration was built. The actual files were removed to reduce
+ // user confusion over how to configure Phabricator.
+
+ switch ($config) {
+ case 'default':
+ case 'production':
+ return array();
+ case 'development':
+ return array(
+ 'phabricator.developer-mode' => true,
+ 'darkconsole.enabled' => true,
+ 'celerity.minify' => false,
+ );
+ }
+
+ $files = id(new FileFinder($root.'/conf/'))
+ ->withType('f')
+ ->withSuffix('conf.php')
+ ->withFollowSymlinks(true)
+ ->find();
+
+ foreach ($files as $key => $file) {
+ $file = trim($file, './');
+ $files[$key] = preg_replace('/\.conf\.php$/', '', $file);
+ }
+ $files = " ".implode("\n ", $files);
+
+ throw new Exception(
+ "CONFIGURATION ERROR\n".
+ "Config file '{$original_config}' does not exist. Valid config files ".
+ "are:\n\n".$files);
+ }
+
// Make sure config file errors are reported.
$old_error_level = error_reporting(E_ALL | E_STRICT);
$old_display_errors = ini_get('display_errors');
@@ -21,42 +58,6 @@
ini_set('display_errors', $old_display_errors);
if ($conf === false) {
- if (!Filesystem::pathExists($full_config_path)) {
-
- // These are very old configuration files which we used to ship with
- // by default. File based configuration was de-emphasized once web-based
- // configuration was built. The actual files were removed to reduce
- // user confusion over how to configure Phabricator.
-
- switch ($config) {
- case 'default':
- case 'production':
- return array();
- case 'development':
- return array(
- 'phabricator.developer-mode' => true,
- 'darkconsole.enabled' => true,
- 'celerity.minify' => false,
- );
- }
-
- $files = id(new FileFinder($root.'/conf/'))
- ->withType('f')
- ->withSuffix('conf.php')
- ->withFollowSymlinks(true)
- ->find();
-
- foreach ($files as $key => $file) {
- $file = trim($file, './');
- $files[$key] = preg_replace('/\.conf\.php$/', '', $file);
- }
- $files = " ".implode("\n ", $files);
-
- throw new Exception(
- "CONFIGURATION ERROR\n".
- "Config file '{$original_config}' does not exist. Valid config files ".
- "are:\n\n".$files);
- }
throw new Exception("Failed to read config file '{$config}': {$errors}");
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 11:44 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7704508
Default Alt Text
D10643.id25558.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility