From a7c9a7e4cc951866bfe385201eeb64098be48ce8 Mon Sep 17 00:00:00 2001 From: Alex Z Date: Sat, 25 Jul 2009 00:19:36 +0000 Subject: [PATCH] Fix a couple notices/strict warnings --- includes/HttpFunctions.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 69c9d5810f..4149a6d730 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -93,7 +93,7 @@ class Http { * 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 @@ class Http { // 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 @@ class Http { return $status; } - function getUploadSessionKey(){ + static function getUploadSessionKey(){ $key = mt_rand( 0, 0x7fffffff ); $_SESSION['wsUploadData'][$key] = array(); return $key; @@ -566,4 +566,4 @@ class simpleFileWriter { } } -} \ No newline at end of file +} -- 2.20.1