From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 2 Feb 2012 15:12:28 +0000 (+0000)
Subject: Strict Standards: Declaration of DatabaseOracle::sourceStream() should be compatible... 
X-Git-Tag: 1.31.0-rc.0~24963
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=01698002f170d1533b50fa7681298bf83b5a8f26;p=lhc%2Fweb%2Fwiklou.git

Strict Standards: Declaration of DatabaseOracle::sourceStream() should be compatible with that of DatabaseBase::sourceStream()

Followup r108768, and also use $inputCallback
---

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 );