summaryrefslogtreecommitdiff
path: root/lib/common.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-02 11:23:41 -0500
committerEvan Prodromou <evan@status.net>2009-11-02 11:23:41 -0500
commitc991047fc4d3a1a231311e26519803f9bb2111dc (patch)
treed799a2548b5034d877b547422a5139f1e48c4983 /lib/common.php
parent3c4ac05cde5a97594d3b0fa7e3f5dbbaf45e4c64 (diff)
parentb22fc5b74aecd505d4e2df01258171fc65d312cf (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/common.php')
-rw-r--r--lib/common.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php
index 2c2f6869e..68bdbf229 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -169,6 +169,7 @@ if (isset($conffile)) {
$_config_files[] = INSTALLDIR.'/config.php';
}
+global $_have_a_config;
$_have_a_config = false;
foreach ($_config_files as $_config_file) {
@@ -187,7 +188,7 @@ function _have_config()
// XXX: Throw a conniption if database not installed
// XXX: Find a way to use htmlwriter for this instead of handcoded markup
if (!_have_config()) {
- echo '<p>'. _('No configuation file found. ') .'</p>';
+ echo '<p>'. _('No configuration file found. ') .'</p>';
echo '<p>'. _('I looked for configuration files in the following places: ') .'<br/> '. implode($_config_files, '<br/>');
echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
echo '<a href="install.php">'. _('Go to the installer.') .'</a>';