diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /includes/specials/SpecialNewimages.php | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/specials/SpecialNewimages.php')
-rw-r--r-- | includes/specials/SpecialNewimages.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php index 546c1914..00c8e050 100644 --- a/includes/specials/SpecialNewimages.php +++ b/includes/specials/SpecialNewimages.php @@ -30,6 +30,9 @@ class SpecialNewFiles extends IncludableSpecialPage { $this->setHeaders(); $this->outputHeader(); + $out = $this->getOutput(); + $this->addHelpLink( 'Help:New images' ); + $pager = new NewFilesPager( $this->getContext(), $par ); if ( !$this->including() ) { @@ -39,9 +42,9 @@ class SpecialNewFiles extends IncludableSpecialPage { $form->displayForm( '' ); } - $this->getOutput()->addHTML( $pager->getBody() ); + $out->addHTML( $pager->getBody() ); if ( !$this->including() ) { - $this->getOutput()->addHTML( $pager->getNavigationBar() ); + $out->addHTML( $pager->getNavigationBar() ); } } @@ -59,7 +62,7 @@ class SpecialNewFiles extends IncludableSpecialPage { if ( !$message->isDisabled() ) { $this->getOutput()->addWikiText( Html::rawElement( 'p', - array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ), + array( 'lang' => $wgContLang->getHtmlCode(), 'dir' => $wgContLang->getDir() ), "\n" . $message->plain() . "\n" ), /* $lineStart */ false, @@ -141,7 +144,7 @@ class NewFilesPager extends ReverseChronologicalPager { $mode = $this->getRequest()->getVal( 'gallerymode', null ); try { $this->gallery = ImageGalleryBase::factory( $mode, $this->getContext() ); - } catch ( MWException $e ) { + } catch ( Exception $e ) { // User specified something invalid, fallback to default. $this->gallery = ImageGalleryBase::factory( false, $this->getContext() ); } @@ -201,7 +204,10 @@ class NewFilesPager extends ReverseChronologicalPager { $context = new DerivativeContext( $this->getContext() ); $context->setTitle( $this->getTitle() ); // Remove subpage $form = new HTMLForm( $fields, $context ); + $form->setSubmitTextMsg( 'ilsubmit' ); + $form->setSubmitProgressive(); + $form->setMethod( 'get' ); $form->setWrapperLegendMsg( 'newimages-legend' ); |