Index: branches/5.1.x/core/kernel/utility/factory.php
===================================================================
diff -u -N -r13086 -r14133
--- branches/5.1.x/core/kernel/utility/factory.php (.../factory.php) (revision 13086)
+++ branches/5.1.x/core/kernel/utility/factory.php (.../factory.php) (revision 14133)
@@ -1,6 +1,6 @@
Files[$real_class])) {
- trigger_error('Real Class '.$real_class.' is not registered with the Factory', E_USER_ERROR);
+ trigger_error('Real Class '.$real_class.' (for pseudo class ' . $pseudo_class . ') is not registered with the Factory', E_USER_ERROR);
}
if(!file_exists(FULL_PATH.$this->Files[$real_class])) {
if ($this->Application->isDebugMode()) {
@@ -227,7 +227,7 @@
{
foreach($this->Dependencies[$real_class] as $dep_class_name)
{
- $this->includeClassFile($dep_class_name);
+ $this->includeClassFile($dep_class_name, $pseudo_class);
}
}
@@ -248,7 +248,7 @@
function &makeClass($pseudo_class)
{
$real_class = $this->realClasses[$pseudo_class];
- if (!class_exists($real_class)) $this->includeClassFile($real_class);
+ if (!class_exists($real_class)) $this->includeClassFile($real_class, $pseudo_class);
$mem_before = memory_get_usage();
$time_before = getmicrotime();