[Phpgroupware-cvs] phpgwapi/inc class.object_factory.inc.php

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/12/27 02:49:50

Modified files:
        inc            : class.object_factory.inc.php 

Log message:
        start transition to new class names

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.object_factory.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8

Patches:
Index: class.object_factory.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.object_factory.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.object_factory.inc.php        24 Sep 2006 12:46:31 -0000      1.7
+++ class.object_factory.inc.php        27 Dec 2006 02:49:50 -0000      1.8
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.object_factory.inc.php,v 1.7 2006/09/24 12:46:31 
skwashd Exp $
+       * @version $Id: class.object_factory.inc.php,v 1.8 2006/12/27 02:49:50 
skwashd Exp $
        */
 
        /**
@@ -50,6 +50,11 @@
                        $is_included = include_class($appname, $classname);
                        if($is_included)
                        {
+                               if ( class_exists("{$appname}_{$classname}") )
+                               {
+                                       $classname = "{$appname}_{$classname}";
+                               }
+
                                if ($p1 === '_UNDEF_')
                                {
                                        $obj = new $classname;