Merge "Don't use isset() to check whether an existing variable is null"

[lhc/web/wiklou.git] / includes / ExternalEdit.php

diff --git a/includes/ExternalEdit.php b/includes/ExternalEdit.php
index b870475..11e9423 100644 (file)
--- a/includes/ExternalEdit.php
+++ b/includes/ExternalEdit.php
@@ -40,7 +40,7 @@ class ExternalEdit extends ContextSource {
         * Check whether external edit or diff should be used.
         *
         * @param $context IContextSource context to use
-        * @param $type String can be either 'edit' or 'diff'
+        * @param string $type can be either 'edit' or 'diff'
         * @return Bool
         */
        public static function useExternalEngine( IContextSource $context, $type ) {
@@ -80,10 +80,16 @@ class ExternalEdit extends ContextSource {
                } elseif ( $this->getRequest()->getVal( 'mode' ) == 'file' ) {
                        $type = "Edit file";
                        $image = wfLocalFile( $this->getTitle() );
-                       $urls = array( 'File' => array(
-                               'Extension' => $image->getExtension(),
-                               'URL' => $image->getCanonicalURL()
-                       ) );
+                       if ( $image ) {
+                               $urls = array(
+                                       'File' => array(
+                                               'Extension' => $image->getExtension(),
+                                               'URL' => $image->getCanonicalURL()
+                                       )
+                               );
+                       } else {
+                               $urls = array();
+                       }
                } else {
                        $type = "Edit text";
                        # *.wiki file extension is used by some editors for syntax