| changeset 64 | ee64bb096f56 |
| parent 57 | 31ce64a3ff6c |
| child 69 | 73780a159e15 |
| 63:af239423ed15 | 64:ee64bb096f56 |
|---|---|
288 // ignore this, it allows using a different config file when a Mercurial repository |
288 // ignore this, it allows using a different config file when a Mercurial repository |
289 // exists in Greyhound's root directory (to allow the devs to have their own config |
289 // exists in Greyhound's root directory (to allow the devs to have their own config |
290 // separate from the default) |
290 // separate from the default) |
291 |
291 |
292 if ( @is_dir(GREY_ROOT . '/.hg') ) |
292 if ( @is_dir(GREY_ROOT . '/.hg') ) |
293 { |
|
293 require(GREY_ROOT . '/config.dev.php'); |
294 require(GREY_ROOT . '/config.dev.php'); |
295 } |
|
294 else |
296 else |
297 { |
|
295 require(GREY_ROOT . '/config.php'); |
298 require(GREY_ROOT . '/config.php'); |
299 } |
|
296 } |
300 } |
297 |
301 |
298 foreach ( array('public', 'enable_ipv4', 'enable_ipv6', 'allowcontrol', 'theme', 'allow_fork', 'use_auth', 'auth_data', 'configpass') as $var ) |
302 foreach ( array('public', 'enable_ipv4', 'enable_ipv6', 'allowcontrol', 'theme', 'allow_fork', 'use_auth', 'auth_data', 'configpass') as $var ) |
299 { |
303 { |
300 if ( isset($$var) ) |
304 if ( isset($$var) ) |