Don't try to autoload a trait if it's already declared

Jaume Alemany · Jaume Alemany · commit 95c3a60402d5 · 2017-07-28T09:51:03.000+02:00
diff --git a/lib/autoload/sfAutoload.class.php b/lib/autoload/sfAutoload.class.php
@@ -188,7 +188,7 @@ public function loadClass($class)
     $class = strtolower($class);
 
     // class already exists
-    if (class_exists($class, false) || interface_exists($class, false))
+    if (class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false))
     {
       return true;
     }

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public function loadClass($class)`
`188`	`188`	`$class = strtolower($class);`
`189`	`189`
`190`	`190`	`// class already exists`
`191`		`- if (class_exists($class, false) \|\| interface_exists($class, false))`
	`191`	`+ if (class_exists($class, false) \|\| interface_exists($class, false) \|\| trait_exists($class, false))`
`192`	`192`	`{`
`193`	`193`	`return true;`
`194`	`194`	`}`