| Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | // Get the file object |
| 33 | 33 | $file = wfLocalFile( $this->title ); |
| 34 | 34 | |
| 35 | | - $source = $file->getFullPath(); |
| | 35 | + $source = $file->getPath(); |
| 36 | 36 | if( !is_file($source ) ){ |
| 37 | 37 | $this->output( 'File not found: ' . $this->title ); |
| 38 | 38 | return false; |
| — | — | @@ -176,7 +176,7 @@ |
| 177 | 177 | function ffmpegEncode( $file, $target, $options, $pass=0 ){ |
| 178 | 178 | global $wgFFmpegLocation; |
| 179 | 179 | // Get the source |
| 180 | | - $source = $file->getFullPath(); |
| | 180 | + $source = $file->getPath(); |
| 181 | 181 | $this->output( "Encode:\n source:$source\n target:$target\n" ); |
| 182 | 182 | |
| 183 | 183 | // Set up the base command |
| — | — | @@ -336,7 +336,7 @@ |
| 337 | 337 | global $wgFFmpeg2theoraLocation; |
| 338 | 338 | |
| 339 | 339 | // Get the source: |
| 340 | | - $source = $file->getFullPath(); |
| | 340 | + $source = $file->getPath(); |
| 341 | 341 | |
| 342 | 342 | // Set up the base command |
| 343 | 343 | $cmd = wfEscapeShellArg( $wgFFmpeg2theoraLocation ) . ' ' . wfEscapeShellArg( $source ); |
| — | — | @@ -419,4 +419,4 @@ |
| 420 | 420 | 'contact' => "--contact" |
| 421 | 421 | ); |
| 422 | 422 | |
| 423 | | -} |
| \ No newline at end of file |
| | 423 | +} |
| Index: trunk/extensions/Push/api/ApiPushImages.php |
| — | — | @@ -256,7 +256,7 @@ |
| 257 | 257 | ); |
| 258 | 258 | |
| 259 | 259 | if ( $egPushDirectFileUploads ) { |
| 260 | | - $requestData['file'] = '@' . $imagePage->getFile()->getFullPath(); |
| | 260 | + $requestData['file'] = '@' . $imagePage->getFile()->getPath(); |
| 261 | 261 | } |
| 262 | 262 | else { |
| 263 | 263 | $requestData['url'] = $imagePage->getDisplayedFile()->getFullUrl(); |