projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplifications
[platal.git]
/
include
/
xorg
/
globals.inc.php
diff --git
a/include/xorg/globals.inc.php
b/include/xorg/globals.inc.php
index
085a2d1
..
1a9fe1f
100644
(file)
--- a/
include/xorg/globals.inc.php
+++ b/
include/xorg/globals.inc.php
@@
-21,8
+21,6
@@
require_once('platal/globals.inc.php');
require_once('platal/globals.inc.php');
-// {{{ class XorgGlobals
-
class XorgGlobals extends PlatalGlobals
{
function XorgGlobals()
class XorgGlobals extends PlatalGlobals
{
function XorgGlobals()
@@
-33,30
+31,15
@@
class XorgGlobals extends PlatalGlobals
function init()
{
global $globals;
function init()
{
global $globals;
- require_once('xorg/hook.inc.php');
- require_once('xorg/menu.inc.php');
$globals = new XorgGlobals;
$globals->core = new CoreConfig;
$globals = new XorgGlobals;
$globals->core = new CoreConfig;
- $globals->root = dirname(dirname(dirname(__FILE__)));
- $globals->hook = new XOrgHook();
- $globals->menu = new XOrgMenu();
-
- $globals->hook->config(null);
$globals->read_config();
$globals->read_config();
- $globals->hook->menu(null);
-
$globals->dbconnect();
$globals->dbconnect();
- if ($globals->debug & 1) {
- $globals->db->trace_on();
- }
- $globals->xdb =& new XOrgDB;
}
}
}
}
-// }}}
-
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
?>
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
?>