Merge "Avoid useless delay and master connections in wfWaitForSlaves() in runJobs...

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

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 0d13433..7686010 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -621,7 +621,7 @@ class DatabaseOracle extends DatabaseBase {
 
        /**
         * @param string $table
-        * @param $row
+        * @param array $row
         * @param string $fname
         * @return bool
         * @throws DBUnexpectedError
@@ -977,7 +977,7 @@ class DatabaseOracle extends DatabaseBase {
        /**
         * Return aggregated value function call
         *
-        * @param $valuedata
+        * @param array $valuedata
         * @param string $valuename
         * @return mixed
         */
@@ -1491,6 +1491,10 @@ class DatabaseOracle extends DatabaseBase {
                                        throw new DBUnexpectedError( $this, "Cannot create LOB descriptor: " . $e['message'] );
                                }
 
+                               if ( is_object( $val ) ) {
+                                       $val = $val->getData();
+                               }
+
                                if ( $col_type == 'BLOB' ) {
                                        $lob[$col]->writeTemporary( $val );
                                        oci_bind_by_name( $stmt, ":$col", $lob[$col], -1, SQLT_BLOB );