(bug 15430) Cancel the upload process and rollback database changes in case no articl...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 80b88eb..70ad4bf 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -563,6 +563,8 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 16726) siprop=namespacealiases should also list localized aliases
 * (bug 16730) Added apprfiltercascade parameter to list=allpages to filter
   cascade-protected pages
+* (bug 15430) Cancel the upload process and rollback database changes in case 
+  no article associated with the file can be created 
 
 === Languages updated in 1.14 ===
 

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 899fbd0..9adac91 100644 (file)
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -913,7 +913,11 @@ class LocalFile extends File
                } else {
                        // New file; create the description page.
                        // There's already a log entry, so don't make a second RC entry
-                       $article->doEdit( $pageText, $comment, EDIT_NEW | EDIT_SUPPRESS_RC );
+                       $result = $article->doEdit( $pageText, $comment, EDIT_NEW | EDIT_SUPPRESS_RC );
+                       if ( !$result->isOK() ) {
+                               $dbw->rollback( __METHOD__ );
+                               return false;
+                       }
                }
 
                # Hooks, hooks, the magic of hooks...