Merge commit 'origin/master' into fusionax

[platal.git] / htdocs / xorg.php

diff --git a/htdocs/xorg.php b/htdocs/xorg.php
index b5e0726..7d65d99 100644 (file)
--- a/htdocs/xorg.php
+++ b/htdocs/xorg.php
@@ -21,20 +21,21 @@
 
 require_once dirname(__FILE__).'/../include/xorg.inc.php';
 
+$platal = new Platal('auth', 'carnet', 'email', 'events', 'forums',
+                     'geoloc', 'lists', 'marketing', 'payment', 'platal',
+                     'profile', 'register', 'search', 'stats', 'admin',
+                     'newsletter', 'axletter', 'bandeau', 'survey',
+                     'fusionax',
+                     'gadgets', 'googleapps');
+
 if (!($path = Env::v('n')) || ($path{0} < 'A' || $path{0} > 'Z')) {
-    $platal = new Platal('auth', 'carnet', 'email', 'events', 'forums',
-                         'geoloc', 'lists', 'marketing', 'payment', 'platal',
-                         'profile', 'register', 'search', 'stats', 'admin',
-                         'newsletter', 'axletter', 'bandeau', 'survey',
-                         'fusionax',
-                         'gadgets', 'googleapps');
     $platal->run();
     exit;
 }
 
 /*** WIKI CODE ***/
 
-include 'wiki/engine.php';
+include pl_core_include('wiki.engine.inc.php');
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>