r110575 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r110574‎ | r110575 | r110576 >
Date:15:12, 2 February 2012
Author:reedy
Status:ok
Tags:notmysql 
Comment:
Strict Standards: Declaration of DatabaseOracle::sourceStream() should be compatible with that of DatabaseBase::sourceStream()

Followup r108768, and also use $inputCallback
Modified paths:
  • /trunk/phase3/includes/db/DatabaseOracle.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/db/DatabaseOracle.php
@@ -970,7 +970,8 @@
971971 }
972972
973973 /* defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}'; */
974 - function sourceStream( $fp, $lineCallback = false, $resultCallback = false, $fname = 'DatabaseOracle::sourceStream' ) {
 974+ function sourceStream( $fp, $lineCallback = false, $resultCallback = false,
 975+ $fname = 'DatabaseOracle::sourceStream', $inputCallback = false ) {
975976 $cmd = '';
976977 $done = false;
977978 $dollarquote = false;
@@ -1024,6 +1025,9 @@
10251026 }
10261027
10271028 $cmd = $this->replaceVars( $cmd );
 1029+ if ( $inputCallback ) {
 1030+ call_user_func( $inputCallback, $cmd );
 1031+ }
10281032 $res = $this->doQuery( $cmd );
10291033 if ( $resultCallback ) {
10301034 call_user_func( $resultCallback, $res, $this );

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r108768Add $inputCsllback to sourceStream(), to return full lines back to the callin...reedy22:10, 12 January 2012

Status & tagging log