* Use call_user_func( $func ) rather than $func(), like wgHooks and parser hooks

[lhc/web/wiklou.git] / includes / DatabasePostgreSQL.php

diff --git a/includes/DatabasePostgreSQL.php b/includes/DatabasePostgreSQL.php
index 35b6853..bb88dcb 100644 (file)
--- a/includes/DatabasePostgreSQL.php
+++ b/includes/DatabasePostgreSQL.php
@@ -227,9 +227,8 @@ class DatabasePgsql extends Database {
                return $retVal;
        }
        
-       function startTimer( $timeout )
-       {
-               global $IP;
+       /** @todo FIXME */
+       function startTimer( $timeout ) {
                wfDebugDieBacktrace( 'Database::startTimer() error : mysql_thread_id() not implemented for postgre' );
                /*$tid = mysql_thread_id( $this->mConn );
                exec( "php $IP/killthread.php $timeout $tid &>/dev/null &" );*/
@@ -255,7 +254,7 @@ class DatabasePgsql extends Database {
        }
 
        function strencode( $s ) {
-               return addslashes( $s );
+               return pg_escape_string( $s );
        }
 
        /**
@@ -372,8 +371,8 @@ class DatabasePgsql extends Database {
                return '';
        }
 
-       function limitResult($limit,$offset) {
-               return " LIMIT $limit ".(is_numeric($offset)?" OFFSET {$offset} ":"");
+       function limitResult($sql, $limit,$offset) {
+               return "$sql LIMIT $limit ".(is_numeric($offset)?" OFFSET {$offset} ":"");
        }
        
        /**