(bug 4974) Don't follow redirected talk page on "new messages" link

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

diff --git a/includes/DatabaseOracle.php b/includes/DatabaseOracle.php
index f41f169..c984240 100644 (file)
--- a/includes/DatabaseOracle.php
+++ b/includes/DatabaseOracle.php
@@ -52,7 +52,7 @@ class DatabaseOracle extends Database {
         */
        function open( $server, $user, $password, $dbName ) {
                if ( !function_exists( 'oci_connect' ) ) {
-                       die( "Oracle functions missing, have you compiled PHP with the --with-oci8 option?\n" );
+                       wfDie( "Oracle functions missing, have you compiled PHP with the --with-oci8 option?\n" );
                }
                $this->close();
                $this->mServer = $server;
@@ -279,14 +279,6 @@ class DatabaseOracle extends Database {
                return true;
        }
 
-       /** @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 &" );*/
-       }
-
-       /** */
        function tableName($name, $forddl = false) {
                # First run any transformations from the parent object
                $name = parent::tableName( $name );
@@ -513,7 +505,7 @@ class DatabaseOracle extends Database {
        function getLag() {
                return false;
        }
-       function getStatus() {
+       function getStatus($which=null) {
                $result = array('Threads_running' => 0, 'Threads_connected' => 0);
                return $result;
        }