X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg.inc.php;h=62bfbe8fb1628e92aeb3bf7ea718a755f151f83c;hb=8fee4fbdc29af94812d560fc90dc1a9e3773fe1c;hp=5aea1870fb0c3600b4c3971fc58a90e8908ddcef;hpb=2b1ee50b0196216dbe4f37e3b039469d6003ca23;p=platal.git

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 5aea187..62bfbe8 100644
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -47,36 +47,17 @@ class XorgPage extends PlatalPage
     }
 }
 
-// }}}
+// {{{ function new_skinned_page()
 
-function _new_page($type, $tpl_name, $admin=false)
+function new_skinned_page($tpl_name)
 {
     global $page;
-    if (!empty($admin)) {
-        $page = new XorgAdmin($tpl_name, $type);
+    if (!$page instanceof XorgPage) {
+        $page = new XorgPage($tpl_name);
     } else {
-        $page = new XorgPage($tpl_name, $type);
+        $page->changeTpl($tpl_name);
     }
-
-    $page->assign('xorg_tpl', $tpl_name);
-}
-
-// {{{ function new_skinned_page()
-
-function new_skinned_page($tpl_name)
-{
-    _new_page(SKINNED, $tpl_name);
 }
 
-// }}}
-// {{{ function new_admin_page()
-
-function new_admin_page($tpl_name)
-{
-    _new_page(SKINNED, $tpl_name, true);
-}
-
-// }}}
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>