Index: branches/5.3.x/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -N -r16178 -r16181 --- branches/5.3.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 16178) +++ branches/5.3.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 16181) @@ -1,6 +1,6 @@ configData); + if ( $loaded_only ) { + return array_keys($this->configData); + } + + return array_keys($this->prefixFiles); } /** @@ -721,12 +727,14 @@ * @param string $prefix Unit config prefix. * * @return string - * @throws Exception When unit config is not found. + * @throws InvalidArgumentException When unit config is not found. */ public function getPrefixFile($prefix) { if ( !isset($this->prefixFiles[$prefix]) ) { - throw new Exception('Configuration file for prefix "' . $prefix . '" is unknown'); + throw new InvalidArgumentException( + 'Configuration file for prefix "' . $prefix . '" is unknown' + ); } return $this->prefixFiles[$prefix];