Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Jul 4, 2014 · 8cfaa28 · 8cfaa28
2 parents a41a4ff + 72897e8
commit 8cfaa28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -5,14 +5,21 @@ title: View Change Log
 
 ## Version 2.2 {#v2-2}
 
-### v2.2.0 {#v2-2-0}
+### v2.2.1 {#v2-2-1}
+
+* Fixes invalid theme name when activating a theme using `php artisan theme:activate` command.
 
+### v2.2.0 {#v2-2-0}
 
 * Bump minimum version to PHP v5.4.0.
 * Add `php artisan theme:detect` and `php artisan theme:activate` command.
 
 ## Version 2.1 {#v2-1}
 
+### v2.1.3 {#v2-1-3}
+
+* Fixes invalid theme name when activating a theme using `php artisan theme:activate` command.
+
 ### v2.1.2 {#v2-1-2}
 
 * Add `php artisan theme:detect` and `php artisan theme:activate` command.

diff --git a/src/View/Console/ActivateCommand.php b/src/View/Console/ActivateCommand.php
@@ -59,7 +59,7 @@ public function fire()
             throw new \InvalidArgumentException("Invalid Theme ID [{$id}].");
         }
 
-        $this->laravel['orchestra.memory']->set("site.theme.{$group}", $themes[$id]->name);
+        $this->laravel['orchestra.memory']->set("site.theme.{$group}", $themes[$id]->uid);
         $this->info("Theme [{$themes[$id]->name}] activated on group [{$group}].");
     }