Followup r76782: is_a() -> instanceof (we dropped PHP 4 support over 3 years ago...

diff --git a/includes/specials/SpecialUploadStash.php b/includes/specials/SpecialUploadStash.php
index d6ed933..5ae6916 100644 (file)
--- a/includes/specials/SpecialUploadStash.php
+++ b/includes/specials/SpecialUploadStash.php
@@ -60,7 +60,7 @@ class SpecialUploadStash extends UnlistedSpecialPage {
                $code = 500;
                $message = 'Unknown error';
 
-               if ( !isset( $subPage ) or $subPage === '' ) {
+               if ( !isset( $subPage ) || $subPage === '' ) {
                        // the user probably visited the page just to see what would happen, so explain it a bit.
                        $code = '400';
                        $message = "Missing key\n\n" 

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 68ec3e1..5c970d8 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -1213,13 +1213,13 @@ abstract class UploadBase {
                $file = $this->getLocalFile();
                // TODO This cries out for refactoring. We really want to say $file->getAllInfo(); here. 
                // Perhaps "info" methods should be moved into files, and the API should just wrap them in queries.
-               if ( is_a( $file, 'UploadStashFile' ) ) { 
+               if ( $file instanceof UploadStashFile ) {
                        $imParam = ApiQueryStashImageInfo::getPropertyNames();
                        $info = ApiQueryStashImageInfo::getInfo( $file, array_flip( $imParam ), $result );
                } else {
                        $imParam = ApiQueryImageInfo::getPropertyNames();
                        $info = ApiQueryImageInfo::getInfo( $file, array_flip( $imParam ), $result );
-               } 
+               }
                return $info;
        }