blob: 5092198f031a002432a6f594a3ac330163c3857b (
plain)
1 --- 0.8.7/lib/functions.php 2008/02/01 19:58:05 4448
2 +++ 0.8.7-patched/lib/functions.php 2008/03/17 23:45:09 4552
3 @@ -143,14 +143,16 @@
4 function read_default_config_option($config_name) {
5 global $config, $settings;
6
7 - reset($settings);
8 - while (list($tab_name, $tab_array) = each($settings)) {
9 - if ((isset($tab_array[$config_name])) && (isset($tab_array[$config_name]["default"]))) {
10 - return $tab_array[$config_name]["default"];
11 - }else{
12 - while (list($field_name, $field_array) = each($tab_array)) {
13 - if ((isset($field_array["items"])) && (isset($field_array["items"][$config_name])) && (isset($field_array["items"][$config_name]["default"]))) {
14 - return $field_array["items"][$config_name]["default"];
15 + if (is_array($settings)) {
16 + reset($settings);
17 + while (list($tab_name, $tab_array) = each($settings)) {
18 + if ((isset($tab_array[$config_name])) && (isset($tab_array[$config_name]["default"]))) {
19 + return $tab_array[$config_name]["default"];
20 + }else{
21 + while (list($field_name, $field_array) = each($tab_array)) {
22 + if ((isset($field_array["items"])) && (isset($field_array["items"][$config_name])) && (isset($field_array["items"][$config_name]["default"]))) {
23 + return $field_array["items"][$config_name]["default"];
24 + }
25 }
26 }
27 }
|
