diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
| commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
| tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/revisiondelete/RevisionDeleter.php | |
| parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
| parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) | |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/revisiondelete/RevisionDeleter.php')
| -rw-r--r-- | includes/revisiondelete/RevisionDeleter.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php index ba1f0f69..db2bc6a4 100644 --- a/includes/revisiondelete/RevisionDeleter.php +++ b/includes/revisiondelete/RevisionDeleter.php @@ -233,9 +233,9 @@ class RevisionDeleter { * @since 1.22 * @param array $bitPars ExtractBitParams() params * @param int $oldfield Current bitfield - * @return array + * @return integer */ - public static function extractBitfield( $bitPars, $oldfield ) { + public static function extractBitfield( array $bitPars, $oldfield ) { // Build the actual new rev_deleted bitfield $newBits = 0; foreach ( $bitPars as $const => $val ) { |