* (bug 11001) Submit Special:Newpages as a GET, rather than a POST request
* The <strong></strong> around links to watched pages in change lists now
has a class - "mw-watched"
+* (bug 9002) Provide a "view/restore deleted edits" link on Special:Upload
+ when a destination filename is provided that corresponds with previous
+ deleted files
== Bugfixes since 1.10 ==
leading to inconsistent paging behaviour
* (bug 9026) Incorrect heading numbering when viewing Special:Statistics with
"auto-numbered headings" enabled
+* Fixed invalid XHTML in Special:Upload
== API changes since 1.10 ==
wfDebug( "Hook 'UploadForm:initial' broke output of the upload form" );
return false;
}
+
+ if( $this->mDesiredDestName && $wgUser->isAllowed( 'delete' ) ) {
+ $title = Title::makeTitleSafe( NS_IMAGE, $this->mDesiredDestName );
+ if( $title instanceof Title && ( $count = $title->isDeleted() ) > 0 ) {
+ $link = wfMsgExt(
+ 'thisisdeleted',
+ array( 'parse', 'replaceafter' ),
+ $wgUser->getSkin()->makeKnownLinkObj(
+ SpecialPage::getTitleFor( 'Undelete', $title->getPrefixedText() ),
+ wfMsgHtml( 'restorelink', $count )
+ )
+ );
+ $wgOut->addHtml( "<div id=\"contentSub2\">{$link}</div>" );
+ }
+ }
$cols = intval($wgUser->getOption( 'cols' ));
$ew = $wgUser->getOption( 'editwidth' );
$sourcefilename = wfMsgHtml( 'sourcefilename' );
$destfilename = wfMsgHtml( 'destfilename' );
- $summary = wfMsgWikiHtml( 'fileuploadsummary' );
+ $summary = wfMsgExt( 'fileuploadsummary', 'parseinline' );
$licenses = new Licenses();
$license = wfMsgExt( 'license', array( 'parseinline' ) );
"<input type='hidden' name='wpSourceType' value='file' />" ;
}
if ( $useAjaxDestCheck ) {
- $warningRow = "<tr><td colspan='2' id='wpDestFile-warning'> </td></tr>";
+ $warningRow = "<tr><td colspan='2' id='wpDestFile-warning'> </td></tr>";
$destOnkeyup = 'onkeyup="wgUploadWarningObj.keypress();"';
} else {
$warningRow = '';
}
return $pageText;
}
-}
-
-
+}
\ No newline at end of file