Revision ab94ba00
Added by Ermal Luçi over 15 years ago
| etc/inc/config.inc | ||
|---|---|---|
| 49 | 49 |
if($g['booting']) echo "."; |
| 50 | 50 |
|
| 51 | 51 |
/* do not load this file twice. */ |
| 52 |
if($config_inc_loaded == true)
|
|
| 52 |
if (is_file_included("/etc/inc/config.inc"))
|
|
| 53 | 53 |
return; |
| 54 |
else |
|
| 55 |
$config_inc_loaded = true; |
|
| 56 | 54 |
|
| 57 | 55 |
// Set the memory limit to 128M. When someone has something like 500+ tunnels |
| 58 | 56 |
// the parser needs quite a bit of ram. Do not remove this line unless you |
| ... | ... | |
| 213 | 211 |
} |
| 214 | 212 |
} |
| 215 | 213 |
|
| 216 |
?> |
|
| 214 |
?> |
|
| etc/inc/pkg-utils.inc | ||
|---|---|---|
| 458 | 458 |
$changedesc = "Overwrote previous installation of {$pkg_info['name']}.";
|
| 459 | 459 |
$to_output = "overwrite!\n"; |
| 460 | 460 |
} |
| 461 |
/* XXX: This is a workaround for Ticket #309. */ |
|
| 462 |
write_config($changedesc); |
|
| 463 | 461 |
$static_output .= $to_output; |
| 464 | 462 |
update_output_window($static_output); |
| 465 | 463 |
/* install other package components */ |
| etc/inc/util.inc | ||
|---|---|---|
| 1138 | 1138 |
return false; |
| 1139 | 1139 |
} |
| 1140 | 1140 |
|
| 1141 |
function is_file_included($file = "") {
|
|
| 1142 |
$files = get_included_files(); |
|
| 1143 |
if (in_array($file, $files)) |
|
| 1144 |
return true; |
|
| 1145 |
|
|
| 1146 |
return false; |
|
| 1147 |
} |
|
| 1148 |
|
|
| 1141 | 1149 |
?> |
Also available in: Unified diff
Ticket #309. Correctly fix the problems of intermediate config lost because of inclusion of config.inc. This might have speed impacts to be measured.