Strict Standards: Declaration of DatabaseOracle::sourceStream() should be compatible...

Followup r108768, and also use $inputCallback

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 701127e..855fc83 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -970,7 +970,8 @@ class DatabaseOracle extends DatabaseBase {
        }
 
        /* defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}'; */
-       function sourceStream( $fp, $lineCallback = false, $resultCallback = false, $fname = 'DatabaseOracle::sourceStream' ) {
+       function sourceStream( $fp, $lineCallback = false, $resultCallback = false,
+               $fname = 'DatabaseOracle::sourceStream', $inputCallback = false ) {
                $cmd = '';
                $done = false;
                $dollarquote = false;
@@ -1024,6 +1025,9 @@ class DatabaseOracle extends DatabaseBase {
                                        }
 
                                        $cmd = $this->replaceVars( $cmd );
+                                       if ( $inputCallback ) {
+                                               call_user_func( $inputCallback, $cmd );
+                                       }
                                        $res = $this->doQuery( $cmd );
                                        if ( $resultCallback ) {
                                                call_user_func( $resultCallback, $res, $this );