From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 27 Dec 2008 23:23:21 +0000 (+0100)
Subject: Use last core on the master.
X-Git-Tag: xorg/0.10.1~164
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1fec3da6a5ec7db190df686bd4c1a71f69308482;hp=c6bad0e735e0eecc5e06ee146148def3a042a0c2;p=platal.git

Use last core on the master.

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

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index dfe342c..2b2d09f 100644
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -289,7 +289,7 @@ class XorgSession extends PlSession
         return null;
     }
 
-    public function makePerms($perm)
+    protected function makePerms($perm, $is_admin)
     {
         $flags = new PlFlagSet();
         if ($perm == 'disabled' || $perm == 'ext') {
diff --git a/core b/core
index 7c8d702..e4f6c7d 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7c8d7022042ef34cbf8c16531a3b5eaecf46bfd2
+Subproject commit e4f6c7d0410bdc8c0f62abc4ee17092dbc52126c