projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix xnetevent subscription.
[platal.git]
/
include
/
common.inc.php
diff --git
a/include/common.inc.php
b/include/common.inc.php
index
bda3922
..
b0f5b8a
100644
(file)
--- a/
include/common.inc.php
+++ b/
include/common.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
0
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-19,20
+19,20
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-function
_
_autoload($cls)
+function
xorg
_autoload($cls)
{
if (!pl_autoload($cls)) {
$cls = strtolower($cls);
{
if (!pl_autoload($cls)) {
$cls = strtolower($cls);
- if (substr($cls, 0, 4) == 'ufc_' || substr($cls, 0, 4) == 'ufo_' || $cls == 'profilefilter') {
-
_
_autoload('userfilter');
+ if (substr($cls, 0, 4) == 'ufc_' || substr($cls, 0, 4) == 'ufo_' || $cls == 'profilefilter'
|| $cls == 'userfiltercondition' || $cls == 'userfilterorder'
) {
+
xorg
_autoload('userfilter');
return;
} else if (substr($cls, 0, 4) == 'pfc_'
|| substr($cls, 0, 4) == 'pfo_'
|| substr($cls, 0, 8) == 'plfilter') {
return;
} else if (substr($cls, 0, 4) == 'pfc_'
|| substr($cls, 0, 4) == 'pfo_'
|| substr($cls, 0, 8) == 'plfilter') {
-
_
_autoload('plfilter');
+
xorg
_autoload('plfilter');
return;
return;
- } else if (substr($cls, 0, 3) == 'de_') {
-
_
_autoload('direnum');
+ } else if (
$cls == 'direnumeration' ||
substr($cls, 0, 3) == 'de_') {
+
xorg
_autoload('direnum');
return;
} else if ($cls == 'validate' || substr($cls, -3, 3) == 'req'
|| substr($cls, -8, 8) == 'validate' || substr($cls, 0, 8) == 'validate') {
return;
} else if ($cls == 'validate' || substr($cls, -3, 3) == 'req'
|| substr($cls, -8, 8) == 'validate' || substr($cls, 0, 8) == 'validate') {
@@
-42,11
+42,20
@@
function __autoload($cls)
require_once 'banana/hooks.inc.php';
Banana::load(substr($cls, 6));
return;
require_once 'banana/hooks.inc.php';
Banana::load(substr($cls, 6));
return;
+ } else if (substr($cls, 0, 5) == 'raven') {
+ // Handled by Raven autoloader.
+ return;
}
include "$cls.inc.php";
}
}
}
include "$cls.inc.php";
}
}
+function __autoload($cls)
+{
+ return xorg_autoload($cls);
+}
+
+spl_autoload_register('xorg_autoload');
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker
f
enc=utf-8:
?>
?>