From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 20 May 2008 22:09:30 +0000 (+0000)
Subject: * (bug 14199) Fix deletion form for image redirect pages
X-Git-Tag: 1.31.0-rc.0~47503
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=03bfe91ec4c1b1af4915efdfc09833a8a5abb3b7;p=lhc%2Fweb%2Fwiklou.git

* (bug 14199) Fix deletion form for image redirect pages

Image deletion was popping up the special image deletion form for the target image, which isn't friendly for redirects. :)
Now checking for redirect state as well as non-localness and non-existence, and pop up the regular page delete form for this.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f464649d58..e91c4ad49c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -286,6 +286,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   even if the wiki's overall content language is not Korean
 * (bug 12773) addOnloadHook() now calls functions immediately when scripts are
   loaded after the primary page completion, instead of dropping them
+* (bug 14199) Fix deletion form for image redirect pages
 
 
 === API changes in 1.13 ===
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 3b63ac2f2e..181905c2a7 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -711,7 +711,7 @@ EOT
 	 */
 	public function delete() {
 		$this->loadFile();
-		if( !$this->img->exists() || !$this->img->isLocal() ) {
+		if( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) {
 			// Standard article deletion
 			Article::delete();
 			return;