Merge "Minor cleanup"

diff --combined includes/api/ApiBase.php
index ff93d2f,0a3edb9..dd685f4
--- 1/includes/api/ApiBase.php
--- 2/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@@ -340,13 -340,15 +340,15 @@@ abstract class ApiBase extends ContextS
                        return '';
                }
                if ( !is_array( $input ) ) {
-                       $input = array(
-                               $input
-                       );
+                       $input = array( $input );
                }
  
                if ( count( $input ) > 0 ) {
-                       $msg = $title . ( count( $input ) > 1 ? 's' : '' ) . ":\n  ";
+                       if ( $title ) {
+                               $msg = $title . ( count( $input ) > 1 ? 's' : '' ) . ":\n  ";
+                       } else {
+                               $msg = '  ';
+                       }
                        $msg .= implode( $prefix, $input ) . "\n";
                        return $msg;
                }
@@@ -1152,11 -1154,11 +1154,11 @@@
         * @return string
         */
        function validateTimestamp( $value, $paramName ) {
 -              $value = wfTimestamp( TS_UNIX, $value );
 -              if ( $value === 0 ) {
 +              $unixTimestamp = wfTimestamp( TS_UNIX, $value );
 +              if ( $unixTimestamp === false ) {
                        $this->dieUsage( "Invalid value '$value' for timestamp parameter $paramName", "badtimestamp_{$paramName}" );
                }
 -              return wfTimestamp( TS_MW, $value );
 +              return wfTimestamp( TS_MW, $unixTimestamp );
        }
  
        /**