From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 27 Sep 2010 08:37:51 +0000 (+0200)
Subject: Update core
X-Git-Tag: xorg/1.0.1~155
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d3f023dd94376f169c0fbe101c55185928f91234;p=platal.git

Update core

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

diff --git a/core b/core
index 1290d41..6e4c4ea 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1290d4101fe07192886e205bf8c645219d94658e
+Subproject commit 6e4c4ead2d8c7e55e9fc9c925130b8425b4ec585
diff --git a/ut/userfiltertest.php b/ut/userfiltertest.php
index 8cfc514..cf21bdc 100644
--- a/ut/userfiltertest.php
+++ b/ut/userfiltertest.php
@@ -35,7 +35,7 @@ class UserFilterTest extends PlTestCase
     private static function buildAccountQuery()
     {
         $args = func_get_args();
-        $joinsAndWhere = XDB::_prepare($args);
+        $joinsAndWhere = XDB::prepare($args);
         return array('SELECT  DISTINCT a.uid
                         FROM  accounts AS a
                           ' . $joinsAndWhere,
@@ -49,7 +49,7 @@ class UserFilterTest extends PlTestCase
     private static function buildProfileQuery()
     {
         $args = func_get_args();
-        $joinsAndWhere = XDB::_prepare($args);
+        $joinsAndWhere = XDB::prepare($args);
         return array('SELECT  DISTINCT a.uid
                         FROM  accounts AS a
                   INNER JOIN  account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET(\'owner\', perms))