Index: branches/5.0.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r12167 -r12195
--- branches/5.0.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 12167)
+++ branches/5.0.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 12195)
@@ -1,6 +1,6 @@
prefixFiles) && ($this->prefixFiles[$prefix] != $filename)) {
+ trigger_error(
+ 'Single unit config prefix "' . $prefix . '" ' .
+ 'is used in multiple unit config files: ' .
+ '"' . $this->prefixFiles[$prefix] . '", "' . $filename . '"',
+ E_USER_WARNING
+ );
+ }
+
$this->configData[$prefix] = $config;
$this->prefixFiles[$prefix] = $filename;
+
return $prefix;
}
elseif ($prefix = array_search($filename, $this->prefixFiles)) {