Merged upstream master

mikevanwinkle · mikevanwinkle · commit e184ffa81175 · 2014-12-18T16:51:15.000-08:00
Merge branch 'master' of github.com:pantheon-systems/cli
diff --git a/php/commands/art.php b/php/commands/art.php
@@ -16,7 +16,7 @@ class Art_Command extends Terminus_Command {
    *
    */
   function __invoke( $args, $assoc_args ) {
-    $artwork = array_shift($args);
+    $artwork = array_shift($args) ?: array_keys($this->works, 0);
 
     if (!empty($artwork) && array_key_exists($artwork, $this->works)){
       echo Terminus::colorize("%g".base64_decode($this->works[$artwork])."%n")."\n";

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class Art_Command extends Terminus_Command {`
`16`	`16`	`*`
`17`	`17`	`*/`
`18`	`18`	`function __invoke( $args, $assoc_args ) {`
`19`		`- $artwork = array_shift($args);`
	`19`	`+ $artwork = array_shift($args) ?: array_keys($this->works, 0);`
`20`	`20`
`21`	`21`	`if (!empty($artwork) && array_key_exists($artwork, $this->works)){`
`22`	`22`	`echo Terminus::colorize("%g".base64_decode($this->works[$artwork])."%n")."\n";`