| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1386,6 +1386,7 @@ |
| 1387 | 1387 | 'filedelete-reason-otherlist', |
| 1388 | 1388 | 'filedelete-reason-dropdown', |
| 1389 | 1389 | 'filedelete-edit-reasonlist', |
| | 1390 | + 'filedelete-maintenance', |
| 1390 | 1391 | ), |
| 1391 | 1392 | 'mimesearch' => array( |
| 1392 | 1393 | 'mimesearch', |
| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -723,7 +723,7 @@ |
| 724 | 724 | global $wgUploadMaintenance; |
| 725 | 725 | if( $wgUploadMaintenance && $this->mTitle && $this->mTitle->getNamespace() == NS_FILE ) { |
| 726 | 726 | global $wgOut; |
| 727 | | - $wgOut->addWikiText('Deletion and restoration of images temporarily disabled during maintenance.' ); |
| | 727 | + $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n", array( 'filedelete-maintenance' ) ); |
| 728 | 728 | return; |
| 729 | 729 | } |
| 730 | 730 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -4223,5 +4223,7 @@ |
| 4224 | 4224 | */ |
| 4225 | 4225 | $wgUseAJAXCategories = false; |
| 4226 | 4226 | |
| 4227 | | -// to disable image delete/restore temporarily |
| | 4227 | +/** |
| | 4228 | + * To disable file delete/restore temporarily |
| | 4229 | + */ |
| 4228 | 4230 | $wgUploadMaintenance = false; |
| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -648,7 +648,7 @@ |
| 649 | 649 | if( $this->mRestore && $this->mAction == "submit" ) { |
| 650 | 650 | global $wgUploadMaintenance; |
| 651 | 651 | if( $wgUploadMaintenance && $this->mTargetObj && $this->mTargetObj->getNamespace() == NS_FILE ) { |
| 652 | | - $wgOut->addWikiText('Deletion and restoration of images temporarily disabled during maintenance.' ); |
| | 652 | + $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n", array( 'filedelete-maintenance' ) ); |
| 653 | 653 | return; |
| 654 | 654 | } |
| 655 | 655 | return $this->undelete(); |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2264,6 +2264,7 @@ |
| 2265 | 2265 | ** Copyright violation |
| 2266 | 2266 | ** Duplicated file', |
| 2267 | 2267 | 'filedelete-edit-reasonlist' => 'Edit delete reasons', |
| | 2268 | +'filedelete-maintenance' => 'Deletion and restoration of files temporarily disabled during maintenance.', |
| 2268 | 2269 | |
| 2269 | 2270 | # MIME search |
| 2270 | 2271 | 'mimesearch' => 'MIME search', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -85,6 +85,8 @@ |
| 86 | 86 | was denied to users(img_auth only) |
| 87 | 87 | * (bug 19646) $wgImgAuthPublicTest added to test to see if img_auth set up |
| 88 | 88 | correctly (img_auth only) |
| | 89 | +* $wgUploadMaintenance added to disable file deletions and restorations during |
| | 90 | + maintenance |
| 89 | 91 | |
| 90 | 92 | === New features in 1.16 === |
| 91 | 93 | |