diff options
| author | Brion Vibber <brion@pobox.com> | 2009-11-01 13:30:51 -0500 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-11-02 06:14:08 -0800 |
| commit | 8e64723813525f3911e3402f4ccf84d8813ce25a (patch) | |
| tree | a0845c5bc1b0514b9c6ba02f9122a1df27f5e0d8 | |
| parent | 412052cd7e721c3483baf6aecc6d6e92cc7ebef7 (diff) | |
Make unit tests work again by forcing a 'global' on $_have_a_config...
Fix a typo in the error message when no config file found.
| -rw-r--r-- | lib/common.php | 3 |
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>'; |