aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/conf
diff options
context:
space:
mode:
authorPim van den Berg2011-02-07 20:33:39 +0100
committerPim van den Berg2011-02-07 20:33:39 +0100
commit0027d95139060c3a9ec5940ab9e96a714b85be74 (patch)
tree0d297c17793151cdc8b5e1b5bbe694c84b32802c /conf
parentreplace function generate_colors by rainbow_colors (diff)
downloadapt-panopticon_cgp-0027d95139060c3a9ec5940ab9e96a714b85be74.zip
apt-panopticon_cgp-0027d95139060c3a9ec5940ab9e96a714b85be74.tar.gz
apt-panopticon_cgp-0027d95139060c3a9ec5940ab9e96a714b85be74.tar.bz2
apt-panopticon_cgp-0027d95139060c3a9ec5940ab9e96a714b85be74.tar.xz
include local configuration file once
When config.php was copied to config.inc.php it would result in a infinite include loop.
Diffstat (limited to 'conf')
-rw-r--r--conf/config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/config.php b/conf/config.php
index fccd250..781172d 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -43,6 +43,6 @@ $CONFIG['socket'] = NULL;
43 43
44# load local configuration 44# load local configuration
45if (file_exists(dirname(__FILE__).'/config.local.php')) 45if (file_exists(dirname(__FILE__).'/config.local.php'))
46 include 'config.local.php'; 46 include_once 'config.local.php';
47 47
48?> 48?>