Revision: 53737
Author: mrzman
Date: 2009-07-25 00:19:36 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
Fix a couple notices/strict warnings
Modified Paths:
--------------
trunk/phase3/includes/HttpFunctions.php
Modified: trunk/phase3/includes/HttpFunctions.php
===================================================================
--- trunk/phase3/includes/HttpFunctions.php 2009-07-25 00:17:21 UTC (rev
53736)
+++ trunk/phase3/includes/HttpFunctions.php 2009-07-25 00:19:36 UTC (rev
53737)
@@ -93,7 +93,7 @@
* should write to a file location and give updates
*
*/
- private function initBackgroundDownload( $url, $target_file_path,
$content_length = null ){
+ private static function initBackgroundDownload( $url,
$target_file_path, $content_length = null ){
global $wgMaxUploadSize, $IP, $wgPhpCli, $wgServer;
$status = Status::newGood();
@@ -115,7 +115,7 @@
// run the background download request:
$cmd = $wgPhpCli . ' ' . $IP .
"/maintenance/http_session_download.php --sid {$session_id} --usk
{$upload_session_key}";
- $pid = wfShellBackgroundExec( $cmd, $retval );
+ $pid = wfShellBackgroundExec( $cmd );
// the pid is not of much use since we won't be visiting this
same apache any-time soon.
if( !$pid )
return Status::newFatal( 'could not run background
shell exec' );
@@ -127,7 +127,7 @@
return $status;
}
- function getUploadSessionKey(){
+ static function getUploadSessionKey(){
$key = mt_rand( 0, 0x7fffffff );
$_SESSION['wsUploadData'][$key] = array();
return $key;
@@ -566,4 +566,4 @@
}
}
-}
\ No newline at end of file
+}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
