Merge pull request #162 from habitissimo/trait-autoload

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

Author: j0k3r

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) || (function_exists('trait_exists') && trait_exists($class, false)))
     {
       return true;
     }