| Property changes on: branches/wmf/1.16wmf4/includes/upload/UploadBase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/includes/upload/UploadBase.php:r77239-77240 |
| Index: branches/wmf/1.16wmf4/includes/upload/UploadStash.php |
| — | — | @@ -101,6 +101,7 @@ |
| 102 | 102 | */ |
| 103 | 103 | public function stashFile( $path, $data = array(), $key = null ) { |
| 104 | 104 | if ( ! file_exists( $path ) ) { |
| | 105 | + wfDebug( "UploadStash: tried to stash file at '$path', but it doesn't exist\n" ); |
| 105 | 106 | throw new UploadStashBadPathException( "path doesn't exist" ); |
| 106 | 107 | } |
| 107 | 108 | $fileProps = File::getPropsFromPath( $path ); |
| — | — | @@ -184,11 +185,13 @@ |
| 185 | 186 | $repoTempPath = $repo->getZonePath( 'temp' ); |
| 186 | 187 | if ( ( ! $repo->validateFilename( $path ) ) || |
| 187 | 188 | ( strpos( $path, $repoTempPath ) !== 0 ) ) { |
| | 189 | + wfDebug( "UploadStash: tried to construct an UploadStashFile from a file that should already exist at '$path', but path is not valid\n" ); |
| 188 | 190 | throw new UploadStashBadPathException( 'path is not valid' ); |
| 189 | 191 | } |
| 190 | 192 | |
| 191 | 193 | // check if path exists! and is a plain file. |
| 192 | 194 | if ( ! $repo->fileExists( $path, FileRepo::FILES_ONLY ) ) { |
| | 195 | + wfDebug( "UploadStash: tried to construct an UploadStashFile from a file that should already exist at '$path', but path is not found\n" ); |
| 193 | 196 | throw new UploadStashFileNotFoundException( 'cannot find path, or not a plain file' ); |
| 194 | 197 | } |
| 195 | 198 | |
| — | — | @@ -365,6 +368,8 @@ |
| 366 | 369 | |
| 367 | 370 | // returns a ThumbnailImage object containing the url and path. Note. NOT A FILE OBJECT. |
| 368 | 371 | $thumb = parent::transform( $params, $flags ); |
| | 372 | + wfDebug( "UploadStash: generating thumbnail\n" ); |
| | 373 | + wfDebug( print_r( $thumb, 1 ) ); |
| 369 | 374 | $key = $this->thumbName($params); |
| 370 | 375 | |
| 371 | 376 | // remove extension, so it's stored in the session under '120px-123456' |
| Property changes on: branches/wmf/1.16wmf4/includes/upload/UploadStash.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 372 | 377 | Merged /trunk/phase3/includes/upload/UploadStash.php:r77239-77240 |
| Property changes on: branches/wmf/1.16wmf4/includes/upload/UploadFromFile.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 373 | 378 | Merged /trunk/phase3/includes/upload/UploadFromFile.php:r77239-77240 |
| Property changes on: branches/wmf/1.16wmf4/includes/upload |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 374 | 379 | Merged /branches/sqlite/includes/upload:r58211-58321 |
| 375 | 380 | Merged /trunk/phase3/includes/upload:r63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,71059,71098,71942,72024,72120,72525,77239-77240 |
| 376 | 381 | Merged /branches/wmf-deployment/includes/upload:r53381,60970 |
| 377 | 382 | Merged /branches/REL1_15/phase3/includes/upload:r51646 |