Index: branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r7816 -r7828
--- branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 7816)
+++ branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 7828)
@@ -370,6 +370,11 @@
foreach ($res as $field) {
$f_name = $field['Field'];
if (getArrayValue($config, 'Fields')) {
+ if (preg_match('/l[\d]+_[\w]/', $f_name)) {
+ // skip multilingual fields
+ continue;
+ }
+
if (!array_key_exists ($f_name, $config['Fields'])) {
$debugger->appendHTML("Config Warning: Field $f_name exists in the database, but is not defined in config file for prefix ".$config['Prefix']." !");
safeDefine('DBG_RAISE_ON_WARNINGS', 1);
@@ -392,10 +397,12 @@
safeDefine('DBG_RAISE_ON_WARNINGS', 1);
}
else if ($options['default'] != '#NOW#' && $field['Default'] !== (string)$options['default']) {
- $debugger->appendHTML("Config Error: Default value for field $f_name (".$options['default'].") in config for prefix ".$config['Prefix']." differs from default value from field in database (".$field['Default'].") !");
+ $debugger->appendHTML("Config Error: Default value for field $f_name (".var_export($options['default'], true).") in config for prefix ".$config['Prefix']." differs from default value from field in database (".var_export($field['Default'], true).") !");
$debugger->dumpVars($field['Default'], $options['default'], 'STRICT');
safeDefine('DBG_RAISE_ON_WARNINGS', 1);
}
+
+ // check that all idfields have default values & are not_null!!!
}
}