Simplification as per Bryan on r62339 comment
authorSam Reed <reedy@users.mediawiki.org>
Thu, 11 Feb 2010 23:09:38 +0000 (23:09 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Thu, 11 Feb 2010 23:09:38 +0000 (23:09 +0000)
includes/api/ApiBase.php

index cd30412..7bd9216 100644 (file)
@@ -973,15 +973,16 @@ abstract class ApiBase {
                $ret = array();
                
                if ( $this->mustBePosted() ) {
-                       $ret = array_merge( $ret, array( array ( 'mustbeposted', $this->getModuleName() ) ) );
+                       $ret[] = array ( 'mustbeposted', $this->getModuleName() );
                }
                
                if ( $this->isReadMode() ) {
-                       $ret = array_merge( $ret, array( array ( 'readrequired' ) ) );
+                       $ret[] = array ( 'readrequired' );
                }
                
                if ( $this->isWriteMode() ) {
-                       $ret = array_merge( $ret, array( array ( 'writerequired' ), array( 'writedisabled' ) ) );
+                       $ret[] = array ( 'writerequired' );
+                       $ret[] = array ( 'writedisabled' );
                }
                
                return $ret;