From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 27 Sep 2010 08:26:10 +0000 (+0200)
Subject: Directly invoke XDB::prepare() instead of using __autoload + call_user_func_array.
X-Git-Tag: core/1.1.1~24
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6e4c4ead2d8c7e55e9fc9c925130b8425b4ec585;p=platal.git

Directly invoke XDB::prepare() instead of using __autoload + call_user_func_array.

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

diff --git a/classes/plsqljoin.php b/classes/plsqljoin.php
index b0ea6d1..91aae45 100644
--- a/classes/plsqljoin.php
+++ b/classes/plsqljoin.php
@@ -19,8 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-__autoload('xdb');
-
 // {{{ class PlSqlJoin
 class PlSqlJoin
 {
@@ -35,7 +33,7 @@ class PlSqlJoin
     private function __construct($mode, $params)
     {
         $table = array_shift($params);
-        $condition = call_user_func_array(array('XDB', 'format'), $params);
+        $condition = XDB::prepare($params);
         if ($mode != self::MODE_LEFT && $mode != self::MODE_RIGHT && $mode != self::MODE_INNER) {
             Platal::page()->kill("Join mode error: unknown mode $mode");
             return;