From 01698002f170d1533b50fa7681298bf83b5a8f26 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 2 Feb 2012 15:12:28 +0000 Subject: [PATCH] Strict Standards: Declaration of DatabaseOracle::sourceStream() should be compatible with that of DatabaseBase::sourceStream() Followup r108768, and also use $inputCallback --- includes/db/DatabaseOracle.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 701127ed4e..855fc83165 100644 --- 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 ); -- 2.20.1