| Index: trunk/phase3/includes/upload/UploadBase.php |
| — | — | @@ -1213,13 +1213,13 @@ |
| 1214 | 1214 | $file = $this->getLocalFile(); |
| 1215 | 1215 | // TODO This cries out for refactoring. We really want to say $file->getAllInfo(); here. |
| 1216 | 1216 | // Perhaps "info" methods should be moved into files, and the API should just wrap them in queries. |
| 1217 | | - if ( is_a( $file, 'UploadStashFile' ) ) { |
| | 1217 | + if ( $file instanceof UploadStashFile ) { |
| 1218 | 1218 | $imParam = ApiQueryStashImageInfo::getPropertyNames(); |
| 1219 | 1219 | $info = ApiQueryStashImageInfo::getInfo( $file, array_flip( $imParam ), $result ); |
| 1220 | 1220 | } else { |
| 1221 | 1221 | $imParam = ApiQueryImageInfo::getPropertyNames(); |
| 1222 | 1222 | $info = ApiQueryImageInfo::getInfo( $file, array_flip( $imParam ), $result ); |
| 1223 | | - } |
| | 1223 | + } |
| 1224 | 1224 | return $info; |
| 1225 | 1225 | } |
| 1226 | 1226 | |
| Index: trunk/phase3/includes/specials/SpecialUploadStash.php |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | $code = 500; |
| 62 | 62 | $message = 'Unknown error'; |
| 63 | 63 | |
| 64 | | - if ( !isset( $subPage ) or $subPage === '' ) { |
| | 64 | + if ( !isset( $subPage ) || $subPage === '' ) { |
| 65 | 65 | // the user probably visited the page just to see what would happen, so explain it a bit. |
| 66 | 66 | $code = '400'; |
| 67 | 67 | $message = "Missing key\n\n" |