* (bug 2597) Don't crash when undeleting an image description page

Added a backtrace on Image constructor given bogus title for debugging aid

diff --git a/includes/Image.php b/includes/Image.php
index 37f02d9..2dfd606 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -69,6 +69,9 @@ class Image
        function Image( $title ) {
                global $wgShowEXIF;
                
+               if( !is_object( $title ) ) {
+                       wfDebugDieBacktrace( 'Image constructor given bogus title.' );
+               }
                $this->title =& $title;
                $this->name = $title->getDBkey();
                $this->metadata = serialize ( array() ) ;

diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index 736b828..51b8083 100644 (file)
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -451,7 +451,7 @@ class UndeleteForm {
 
                                if (NS_IMAGE == $this->mTargetObj->getNamespace()) {
                                        /* refresh image metadata cache */
-                                       new Image( $this->mTargetObj->getText(), true );
+                                       new Image( $this->mTargetObj );
                                }
 
                                return true;