Merge branch 'xorg/maint' into xorg/1.0.2/master

[platal.git] / include / common.inc.php

diff --git a/include/common.inc.php b/include/common.inc.php
index f8340f8..bda3922 100644 (file)
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -33,17 +33,20 @@ function __autoload($cls)
             return;
         } else if (substr($cls, 0, 3) == 'de_') {
             __autoload('direnum');
-        } else if (substr($cls, -3, 3) == 'req') {
-            @include 'validations.inc.php';
+            return;
+        } else if ($cls == 'validate' || substr($cls, -3, 3) == 'req'
+                   || substr($cls, -8, 8) == 'validate' || substr($cls, 0, 8) == 'validate') {
+            require_once 'validations.inc.php';
             return;
         } else if (substr($cls, 0, 6) == 'banana') {
-            require_once 'banana/banana.inc.php';
+            require_once 'banana/hooks.inc.php';
             Banana::load(substr($cls, 6));
             return;
         }
-        @include "$cls.inc.php";
+        include "$cls.inc.php";
     }
 }
 
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>