Somehow managed to forget to check this in...

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

diff --git a/includes/DatabaseOracle.php b/includes/DatabaseOracle.php
index 8aec858..226bb4d 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;
@@ -454,12 +454,12 @@ class DatabaseOracle extends Database {
 #              return "TO_TIMESTAMP('" . $this->strencode(wfTimestamp(TS_DB, $ts)) . "', 'RRRR-MM-DD HH24:MI:SS')";
        }
 
-        /**
-         * Return aggregated value function call
-         */
-        function aggregateValue ($valuedata,$valuename='value') {
-                return $valuedata;
-        }
+       /**
+        * Return aggregated value function call
+        */
+       function aggregateValue ($valuedata,$valuename='value') {
+               return $valuedata;
+       }
 
 
        function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
@@ -497,7 +497,7 @@ class DatabaseOracle extends Database {
        function immediateCommit( $fname = 'Database::immediateCommit' ) {
                oci_commit($this->mConn);
                $this->mTrxLevel = 0;
-        }
+       }
        function rollback( $fname = 'Database::rollback' ) {
                oci_rollback($this->mConn);
                $this->mTrxLevel = 0;
@@ -658,7 +658,7 @@ class DatabaseOracle extends Database {
                                if (is_object($value) && $value->isLOB()) {
                                        $blob = oci_new_descriptor($this->mConn, OCI_D_LOB);
                                        $bdata = $value->data();
-                                       oci_bind_by_name($stmt, ":bobj", &$blob, -1, OCI_B_BLOB);
+                                       oci_bind_by_name($stmt, ":bobj", $blob, -1, OCI_B_BLOB);
                                } else
                                        oci_bind_by_name($stmt, ":$k", $a[$key][$k], -1);
                                if ($this->debug())