Don't assume the file repository will always return an object when checking for dupes

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index a9070da..3b0c6b7 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -552,10 +552,11 @@ EOT
        function checkSharedConflictCallback( $repo ) {
                $this->loadFile();
                $dupfile = $repo->newFile( $this->img->getTitle() );
-               if( $dupfile->exists() ) {
+               if( $dupfile && $dupfile->exists() ) {
                        $this->dupFile = $dupfile;
+                       return $dupfile->exists();
                }
-               return $dupfile->exists();
+               return false;
        }
 
        function getUploadUrl() {