X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fchanges%2FChangesListFilter.php;h=d191453624af6729558ed52f40754de3b87b93c9;hb=9189db0c50cd4f755efc1d0ce061f6c04b236a40;hp=2546f2ba827efd0960c973f66c287db96589545a;hpb=6f4eda1fd3e4f592c30b4b8a86bac53301eaec9f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/changes/ChangesListFilter.php b/includes/changes/ChangesListFilter.php index 2546f2ba82..d191453624 100644 --- a/includes/changes/ChangesListFilter.php +++ b/includes/changes/ChangesListFilter.php @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ @@ -184,8 +183,7 @@ abstract class ChangesListFilter { * (not filtered out), even for the hide-based filters. So e.g. conflicting with * 'hideanons' means there is a conflict if only anonymous users are *shown*. * - * @param ChangesListFilterGroup|ChangesListFilter $other Other - * ChangesListFilterGroup or ChangesListFilter + * @param ChangesListFilterGroup|ChangesListFilter $other * @param string $globalKey i18n key for top-level conflict message * @param string $forwardKey i18n key for conflict message in this * direction (when in UI context of $this object) @@ -216,8 +214,7 @@ abstract class ChangesListFilter { * * Internal use ONLY. * - * @param ChangesListFilterGroup|ChangesListFilter $other Other - * ChangesListFilterGroup or ChangesListFilter + * @param ChangesListFilterGroup|ChangesListFilter $other * @param string $globalDescription i18n key for top-level conflict message * @param string $contextDescription i18n key for conflict message in this * direction (when in UI context of $this object) @@ -468,7 +465,7 @@ abstract class ChangesListFilter { * @param FormOptions $opts * @return bool */ - public function activelyInConflictWithFilter( ChangeslistFilter $filter, FormOptions $opts ) { + public function activelyInConflictWithFilter( ChangesListFilter $filter, FormOptions $opts ) { if ( $this->isSelected( $opts ) && $filter->isSelected( $opts ) ) { /** @var ChangesListFilter $siblingFilter */ foreach ( $this->getSiblings() as $siblingFilter ) { @@ -484,7 +481,7 @@ abstract class ChangesListFilter { return false; } - private function hasConflictWithFilter( ChangeslistFilter $filter ) { + private function hasConflictWithFilter( ChangesListFilter $filter ) { return in_array( $filter, $this->getConflictingFilters() ); }