Index: trunk/core/kernel/utility/factory.php
===================================================================
diff -u -r4794 -r4802
--- trunk/core/kernel/utility/factory.php (.../factory.php) (revision 4794)
+++ trunk/core/kernel/utility/factory.php (.../factory.php) (revision 4802)
@@ -197,8 +197,12 @@
function includeClassFile($real_class)
{
if (class_exists($real_class)) return;
- if(!$this->Files[$real_class]) trigger_error('Real Class '.$real_class.' is not registered with the Factory', E_USER_ERROR);
- if(!file_exists($this->Files[$real_class])) trigger_error('Include file for class '.$real_class.' ('.$this->Files[$real_class].') does not exists', E_USER_ERROR);
+ if(!isset($this->Files[$real_class])) {
+ trigger_error('Real Class '.$real_class.' is not registered with the Factory', E_USER_ERROR);
+ }
+ if(!file_exists($this->Files[$real_class])) {
+ trigger_error('Include file for class '.$real_class.' ('.$this->Files[$real_class].') does not exists', E_USER_ERROR);
+ }
if( isset( $this->Dependencies[$real_class] ) )
{
@@ -294,10 +298,6 @@
{
$dependencies =& $this->Dependencies[$depended_class];
- if ($class_name == 'kFormatter') {
- echo '';
- }
-
$conditions = Array();
$conditions['exists'] = is_array($dependencies) && in_array($this->realClasses[$class_name], $dependencies);
$conditions['same_class'] = $this->realClasses[$class_name] == $depended_class;