From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 14 Aug 2008 19:37:53 +0000 (+0200)
Subject: Load xorg.js by default on xorg and xnet.
X-Git-Tag: xorg/0.10.0~133
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4c92db487808dfac7b56d8804a8b6d93bd07ae87;p=platal.git

Load xorg.js by default on xorg and xnet.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/classes/xnetpage.php b/classes/xnetpage.php
index 77ca8cb..bebe4aa 100644
--- a/classes/xnetpage.php
+++ b/classes/xnetpage.php
@@ -41,6 +41,7 @@ class XnetPage extends PlPage
             $this->assign('is_admin', may_update());
             $this->assign('is_member', is_member());
         }
+        $this->addJsLink('xorg.js');
     }
 
     // }}}
diff --git a/classes/xorgpage.php b/classes/xorgpage.php
index f0d42ea..d2bb501 100644
--- a/classes/xorgpage.php
+++ b/classes/xorgpage.php
@@ -27,6 +27,7 @@ class XorgPage extends PlPage
 
         // Set the default page
         $this->changeTpl('platal/index.tpl');
+        $this->addJsLink('xorg.js');
     }
 
     public function run()
diff --git a/core b/core
index 1f16638..4e46552 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1f16638f53b3521f838ce7cdb341c2332e4a046d
+Subproject commit 4e465523dbcaa0bae9cf0ab773617705884b2a8b