Merge "objectcache: convert APC and hash BagOStuff to using mergeViaCas()"

[lhc/web/wiklou.git] / includes / Block.php

diff --git a/includes/Block.php b/includes/Block.php
index 65408f6..0693650 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -148,14 +148,6 @@ class Block {
                        'sitewide'        => true,
                ];
 
-               if ( func_num_args() > 1 || !is_array( $options ) ) {
-                       $options = array_combine(
-                               array_slice( array_keys( $defaults ), 0, func_num_args() ),
-                               func_get_args()
-                       );
-                       wfDeprecated( __METHOD__ . ' with multiple arguments', '1.26' );
-               }
-
                $options += $defaults;
 
                $this->setTarget( $options['address'] );