Fabien Potencier пре 14 година
родитељ
комит
7ffac6efc8
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4 4
      src/Symfony/Framework/bootstrap.php

+ 4 - 4
src/Symfony/Framework/bootstrap.php

@@ -138,14 +138,14 @@ class ErrorHandler {
 namespace Symfony\Framework;
 class ClassCollectionLoader {
     static protected $loaded;
-    static public function load($classes, $cacheDir, $name, $autoReload, $strict = false) {
+    static public function load($classes, $cacheDir, $name, $autoReload, $adaptive = false) {
                 if (isset(self::$loaded[$name])) {
             return; }
+        self::$loaded[$name] = true;
         $classes = array_unique($classes);
-        if ($strict) {
-                        $classes = array_diff($classes, get_declared_classes());
+        if ($adaptive) {
+                        $classes = array_diff($classes, get_declared_classes(), get_declared_interfaces());
                         $name = $name.'-'.substr(md5(implode('|', $classes)), 0, 5); }
-        self::$loaded[$name] = true;
         $cache = $cacheDir.'/'.$name.'.php';
                 $reload = false;
         if ($autoReload) {