Index: trunk/core/kernel/utility/factory.php
===================================================================
diff -u -N -r4880 -r6093
--- trunk/core/kernel/utility/factory.php	(.../factory.php)	(revision 4880)
+++ trunk/core/kernel/utility/factory.php	(.../factory.php)	(revision 6093)
@@ -200,8 +200,8 @@
 			if(!isset($this->Files[$real_class])) {
 				trigger_error('Real Class <b>'.$real_class.'</b> is not registered with the Factory', E_USER_ERROR);
 			}
-			if(!file_exists($this->Files[$real_class])) {
-				trigger_error('Include file for class <b>'.$real_class.'</b> (<b>'.$this->Files[$real_class].'</b>) does not exists', E_USER_ERROR);
+			if(!file_exists(FULL_PATH.$this->Files[$real_class])) {
+				trigger_error('Include file for class <b>'.$real_class.'</b> (<b>'.FULL_PATH.$this->Files[$real_class].'</b>) does not exists', E_USER_ERROR);
 			}
 
 			if( isset( $this->Dependencies[$real_class] ) )
@@ -212,7 +212,7 @@
 				}
 			}
 
-			k4_include_once($this->Files[$real_class]);
+			k4_include_once(FULL_PATH.$this->Files[$real_class]);
 		}
 
 		/**
@@ -269,7 +269,9 @@
 		function registerClass($real_class, $file, $pseudo_class=null, $dependecies = Array() )
 		{
 			if(!isset($pseudo_class)) $pseudo_class = $real_class;
-			if(!isset($this->Files[$real_class])) $this->Files[$real_class]=$file;
+			if (!isset($this->Files[$real_class])) {
+				$this->Files[$real_class] = preg_replace('/^'.preg_quote(FULL_PATH, '/').'/', '', $file, 1);
+			}
 
 			if (isset($this->realClasses[$pseudo_class])) {
 				$this->registerDependency($real_class, $pseudo_class);