Merge "Change rules when displaying block log extract"

[lhc/web/wiklou.git] / includes / block / BlockRestriction.php

diff --git a/includes/block/BlockRestriction.php b/includes/block/BlockRestriction.php
index 3ce682b..5bf286d 100644 (file)
--- a/includes/block/BlockRestriction.php
+++ b/includes/block/BlockRestriction.php
@@ -34,7 +34,6 @@ class BlockRestriction {
         *
         * @param int|array $blockId
         * @param IDatabase|null $db
-        * @param array $options Options to pass to the select query.
         * @return Restriction[]
         */
        public static function loadByBlockId( $blockId, IDatabase $db = null ) {
@@ -112,7 +111,7 @@ class BlockRestriction {
                $blockIds = array_keys( $restrictionList );
                if ( !empty( $blockIds ) ) {
                        $result = $dbw->select(
-                               [ 'ipblocks_restrictions', 'page' ],
+                               [ 'ipblocks_restrictions' ],
                                [ 'ir_ipb_id', 'ir_type', 'ir_value' ],
                                [ 'ir_ipb_id' => $blockIds ],
                                __METHOD__,