Page MenuHomestyx hydra
Files F10048823

No OneTemporary
Actions

View Options

diff --git a/conf/__init_conf__.php b/conf/__init_conf__.php
index 7dfd59f05d..941efd1b09 100644
--- a/conf/__init_conf__.php
+++ b/conf/__init_conf__.php
@@ -1,64 +1,65 @@
<?php
function phabricator_read_config_file($original_config) {
$root = dirname(dirname(__FILE__));
// Accept either "myconfig" (preferred) or "myconfig.conf.php".
$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');
ini_set('display_errors', 1);
ob_start();
$conf = include $full_config_path;
$errors = ob_get_clean();
error_reporting($old_error_level);
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}");
}
return $conf;
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Mar 16, 10:42 PM (19 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
963479
Default Alt Text
(3 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)