Author: fabien
Date: 2010-02-17 10:15:08 +0100 (Wed, 17 Feb 2010)
New Revision: 28071
Modified:
branches/2.0/src/Symfony/Foundation/UniversalClassLoader.php
Log:
Merge branch 'master' of git://github.com/symfony/symfony
Modified: branches/2.0/src/Symfony/Foundation/UniversalClassLoader.php
===================================================================
--- branches/2.0/src/Symfony/Foundation/UniversalClassLoader.php
2010-02-17 01:57:43 UTC (rev 28070)
+++ branches/2.0/src/Symfony/Foundation/UniversalClassLoader.php
2010-02-17 09:15:08 UTC (rev 28071)
@@ -124,7 +124,11 @@
if (0 === strpos($namespace, $ns))
{
$class = substr($class, $pos + 1);
- require $dir.DIRECTORY_SEPARATOR.str_replace('\\',
DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_',
DIRECTORY_SEPARATOR, $class).'.php';
+ $file = $dir.DIRECTORY_SEPARATOR.str_replace('\\',
DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_',
DIRECTORY_SEPARATOR, $class).'.php';
+ if (file_exists($file))
+ {
+ require $file;
+ }
return;
}
@@ -137,7 +141,11 @@
{
if (0 === strpos($class, $prefix))
{
- require $dir.DIRECTORY_SEPARATOR.str_replace('_',
DIRECTORY_SEPARATOR, $class).'.php';
+ $file = $dir.DIRECTORY_SEPARATOR.str_replace('_',
DIRECTORY_SEPARATOR, $class).'.php';
+ if (file_exists($file))
+ {
+ require $file;
+ }
return;
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
