wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make unit tests work again by forcing a 'global' on $_have_a_config...

Browse Source 
Fix a typo in the error message when no config file found.
This commit is contained in:
Brion Vibber 2009-11-01 13:30:51 -05:00
parent 412052cd7e
commit 8e64723813
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/common.php
View File

@ -169,6 +169,7 @@ if (isset($conffile)) {
$_config_files[] = INSTALLDIR.'/config.php'; $_config_files[] = INSTALLDIR.'/config.php';
} }
global $_have_a_config;
$_have_a_config = false; $_have_a_config = false;
foreach ($_config_files as $_config_file) { foreach ($_config_files as $_config_file) {
@ -187,7 +188,7 @@ function _have_config()
// XXX: Throw a conniption if database not installed // XXX: Throw a conniption if database not installed
// XXX: Find a way to use htmlwriter for this instead of handcoded markup // XXX: Find a way to use htmlwriter for this instead of handcoded markup
if (!_have_config()) { 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>'. _('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 '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
echo '<a href="install.php">'. _('Go to the installer.') .'</a>'; echo '<a href="install.php">'. _('Go to the installer.') .'</a>';