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/SpecialRecentchanges.php | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/specials/SpecialRecentchanges.php')
-rw-r--r-- | includes/specials/SpecialRecentchanges.php | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index e6d8f1c3..64b0ecae 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -95,7 +95,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage { protected function getCustomFilters() { if ( $this->customFilters === null ) { $this->customFilters = parent::getCustomFilters(); - wfRunHooks( 'SpecialRecentChangesFilters', array( $this, &$this->customFilters ), '1.23' ); + Hooks::run( 'SpecialRecentChangesFilters', array( $this, &$this->customFilters ), '1.23' ); } return $this->customFilters; @@ -252,9 +252,11 @@ class SpecialRecentChanges extends ChangesListSpecialPage { return $rows; } - protected function runMainQueryHook( &$tables, &$fields, &$conds, &$query_options, &$join_conds, $opts ) { + protected function runMainQueryHook( &$tables, &$fields, &$conds, + &$query_options, &$join_conds, $opts + ) { return parent::runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts ) - && wfRunHooks( + && Hooks::run( 'SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts, &$query_options, &$fields ), '1.23' @@ -311,7 +313,9 @@ class SpecialRecentChanges extends ChangesListSpecialPage { $rc = RecentChange::newFromRow( $obj ); $rc->counter = $counter++; # Check if the page has been updated since the last visit - if ( $this->getConfig()->get( 'ShowUpdatedMarker' ) && !empty( $obj->wl_notificationtimestamp ) ) { + if ( $this->getConfig()->get( 'ShowUpdatedMarker' ) + && !empty( $obj->wl_notificationtimestamp ) + ) { $rc->notificationtimestamp = ( $obj->rc_timestamp >= $obj->wl_notificationtimestamp ); } else { $rc->notificationtimestamp = false; // Default @@ -440,11 +444,11 @@ class SpecialRecentChanges extends ChangesListSpecialPage { $message = $this->msg( 'recentchangestext' )->inContentLanguage(); if ( !$message->isDisabled() ) { $this->getOutput()->addWikiText( - Html::rawElement( 'p', - array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ), + Html::rawElement( 'div', + array( 'lang' => $wgContLang->getHtmlCode(), 'dir' => $wgContLang->getDir() ), "\n" . $message->plain() . "\n" ), - /* $lineStart */ false, + /* $lineStart */ true, /* $interface */ false ); } @@ -475,7 +479,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage { // Don't fire the hook for subclasses. (Or should we?) if ( $this->getName() === 'Recentchanges' ) { - wfRunHooks( 'SpecialRecentChangesPanel', array( &$extraOpts, $opts ) ); + Hooks::run( 'SpecialRecentChangesPanel', array( &$extraOpts, $opts ) ); } return $extraOpts; @@ -732,7 +736,8 @@ class SpecialRecentChanges extends ChangesListSpecialPage { $link = $this->makeOptionsLink( $linkMessage->text(), array( $key => 1 - $options[$key] ), $nondefaults ); - $links[] = "<span class=\"$msg rcshowhideoption\">" . $this->msg( $msg )->rawParams( $link )->escaped() . '</span>'; + $links[] = "<span class=\"$msg rcshowhideoption\">" + . $this->msg( $msg )->rawParams( $link )->escaped() . '</span>'; } // show from this onward link |