SQL upgrade for my last commit

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

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index e655036..97c8a03 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -18,15 +18,13 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
+
 require_once('platal.inc.php');
-require_once('xorg/globals.inc.php');
+require_once('globals.inc.php');
 require_once('xorg/session.inc.php');
-XorgGlobals::init();
-XorgGlobals::setlocale();
+$globals = new PlatalGlobals('XorgSession');
 XorgSession::init();
 
-require_once('platal/page.inc.php');
-
 // {{{ class XorgPage
 
 class XorgPage extends PlatalPage
@@ -92,21 +90,6 @@ function new_admin_page($tpl_name)
 }
 
 // }}}
-// {{{ function new_admin_table_editor()
-
-function new_admin_table_editor($table, $idfield, $idedit=false)
-{
-    array_walk($_GET, 'unfix_gpc_magic');
-    array_walk($_POST, 'unfix_gpc_magic');
-    array_walk($_REQUEST, 'unfix_gpc_magic');
-
-    global $editor;
-    new_admin_page('table-editor.tpl');
-    require_once('xorg.table-editor.inc.php');
-    $editor = new XOrgAdminTableEditor($table, $idfield, $idedit);
-}
-
-// }}}
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>