| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | * should write to a file location and give updates |
| 95 | 95 | * |
| 96 | 96 | */ |
| 97 | | - private function initBackgroundDownload( $url, $target_file_path, $content_length = null ){ |
| | 97 | + private static function initBackgroundDownload( $url, $target_file_path, $content_length = null ){ |
| 98 | 98 | global $wgMaxUploadSize, $IP, $wgPhpCli, $wgServer; |
| 99 | 99 | $status = Status::newGood(); |
| 100 | 100 | |
| — | — | @@ -115,7 +115,7 @@ |
| 116 | 116 | |
| 117 | 117 | // run the background download request: |
| 118 | 118 | $cmd = $wgPhpCli . ' ' . $IP . "/maintenance/http_session_download.php --sid {$session_id} --usk {$upload_session_key}"; |
| 119 | | - $pid = wfShellBackgroundExec( $cmd, $retval ); |
| | 119 | + $pid = wfShellBackgroundExec( $cmd ); |
| 120 | 120 | // the pid is not of much use since we won't be visiting this same apache any-time soon. |
| 121 | 121 | if( !$pid ) |
| 122 | 122 | return Status::newFatal( 'could not run background shell exec' ); |
| — | — | @@ -127,7 +127,7 @@ |
| 128 | 128 | return $status; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | | - function getUploadSessionKey(){ |
| | 131 | + static function getUploadSessionKey(){ |
| 132 | 132 | $key = mt_rand( 0, 0x7fffffff ); |
| 133 | 133 | $_SESSION['wsUploadData'][$key] = array(); |
| 134 | 134 | return $key; |
| — | — | @@ -566,4 +566,4 @@ |
| 567 | 567 | } |
| 568 | 568 | } |
| 569 | 569 | |
| 570 | | -} |
| \ No newline at end of file |
| | 570 | +} |