From a4852d4a64f52c5a2b5ba31ca7066443601da161 Mon Sep 17 00:00:00 2001
From: epriestley <epriestley@phabricator.com>
Date: Fri, 11 Feb 2011 13:17:06 -0800
Subject: [PATCH] Dedupe conf loading function.

Summary:

Test Plan:

Reviewers:

CC:
---
 conf/__init_conf__.php      | 26 ++++++++++++++++++++++++++
 scripts/__init_script__.php |  9 +--------
 webroot/index.php           | 13 ++-----------
 3 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 conf/__init_conf__.php

diff --git a/conf/__init_conf__.php b/conf/__init_conf__.php
new file mode 100644
index 0000000000..94bfd5636f
--- /dev/null
+++ b/conf/__init_conf__.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function phabricator_read_config_file($config) {
+  $root = dirname(dirname(__FILE__));
+  $conf = include $root.'/conf/'.$config.'.conf.php';
+  if ($conf === false) {
+    throw new Exception("Failed to read config file '{$config}'.");
+  }
+  return $conf;
+}
diff --git a/scripts/__init_script__.php b/scripts/__init_script__.php
index 94ab4396da..bdf6abeb83 100644
--- a/scripts/__init_script__.php
+++ b/scripts/__init_script__.php
@@ -31,11 +31,4 @@ if (!ini_get('date.timezone')) {
 
 phutil_load_library(dirname(__FILE__).'/../src/');
 
-function phabricator_read_config_file($config) {
-  $root = dirname(dirname(__FILE__));
-  $conf = include $root.'/conf/'.$config.'.conf.php';
-  if ($conf === false) {
-    throw new Exception("Failed to read config file '{$config}'.");
-  }
-  return $conf;
-}
+require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php';
diff --git a/webroot/index.php b/webroot/index.php
index 3ed1ef866a..e9a74d221c 100644
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -35,6 +35,8 @@ if (!function_exists('mysql_connect')) {
     "the PHP MySQL extension is not installed. This extension is required.");
 }
 
+require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php';
+
 $conf = phabricator_read_config_file($env);
 $conf['phabricator.env'] = $env;
 
@@ -150,14 +152,3 @@ function setup_aphront_basics() {
 function __autoload($class_name) {
   PhutilSymbolLoader::loadClass($class_name);
 }
-
-
-function phabricator_read_config_file($config) {
-  $root = dirname(dirname(__FILE__));
-  $conf = include $root.'/conf/'.$config.'.conf.php';
-  if ($conf === false) {
-    throw new Exception("Failed to read config file '{$config}'.");
-  }
-  return $conf;
-}
-