X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flogging%2FLogEventsList.php;h=0cf584b0a2a1f9977b702fb40472d339f1551e8d;hb=9964ca1a390c446397dcd466916ffed356cdc3c9;hp=da5527eb9a5e7dc22cefdd147f6dd2cc144f54ca;hpb=42324aff4e173b70aeed4f520ff0f5b96557d24e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php index da5527eb9a..0cf584b0a2 100644 --- a/includes/logging/LogEventsList.php +++ b/includes/logging/LogEventsList.php @@ -310,7 +310,7 @@ class LogEventsList extends ContextSource { return ''; } $html = ''; - $html .= xml::label( wfMessage( 'log-action-filter-' . $types[0] )->text(), + $html .= Xml::label( wfMessage( 'log-action-filter-' . $types[0] )->text(), 'action-filter-' .$types[0] ) . "\n"; $select = new XmlSelect( 'subtype' ); $select->addOption( wfMessage( 'log-action-filter-all' )->text(), '' ); @@ -319,7 +319,7 @@ class LogEventsList extends ContextSource { $select->addOption( wfMessage( $msgKey )->text(), $value ); } $select->setDefault( $action ); - $html .= $select->getHtml(); + $html .= $select->getHTML(); return $html; } @@ -553,6 +553,7 @@ class LogEventsList extends ContextSource { * - flags Integer display flags (NO_ACTION_LINK,NO_EXTRA_USER_LINKS) * - useRequestParams boolean Set true to use Pager-related parameters in the WebRequest * - useMaster boolean Use master DB + * - extraUrlParams array|bool Additional url parameters for "full log" link (if it is shown) * @return int Number of total log items (not limited by $lim) */ public static function showLogExtract( @@ -567,6 +568,7 @@ class LogEventsList extends ContextSource { 'flags' => 0, 'useRequestParams' => false, 'useMaster' => false, + 'extraUrlParams' => false, ]; # The + operator appends elements of remaining keys from the right # handed array to the left handed, whereas duplicated keys are NOT overwritten. @@ -578,6 +580,8 @@ class LogEventsList extends ContextSource { $msgKey = $param['msgKey']; $wrap = $param['wrap']; $flags = $param['flags']; + $extraUrlParams = $param['extraUrlParams']; + $useRequestParams = $param['useRequestParams']; if ( !is_array( $msgKey ) ) { $msgKey = [ $msgKey ]; @@ -664,7 +668,11 @@ class LogEventsList extends ContextSource { $urlParam['type'] = $types[0]; } - $s .= Linker::link( + if ( $extraUrlParams !== false ) { + $urlParam = array_merge( $urlParam, $extraUrlParams ); + } + + $s .= Linker::linkKnown( SpecialPage::getTitleFor( 'Log' ), $context->msg( 'log-fulllog' )->escaped(), [],