Kohana v3.3.5

modules/minion/classes/Kohana/Minion/CLI.php

@@ -170,7 +170,7 @@ class Kohana_Minion_CLI {
 			// Create temporary file
 			file_put_contents($vbscript, 'wscript.echo(InputBox("'.addslashes($text).'"))');
 
-			$password = shell_exec('cscript //nologo '.escapeshellarg($text));
+			$password = shell_exec('cscript //nologo '.escapeshellarg($vbscript));
 
 			// Remove temporary file.
 			unlink($vbscript);
@@ -278,7 +278,7 @@ class Kohana_Minion_CLI {
 	 * @copyright  2010 - 2011 Fuel Development Team
 	 * @link       http://fuelphp.com
 	 * @param string $text the text to color
-	 * @param atring $foreground the foreground color
+	 * @param string $foreground the foreground color
 	 * @param string $background the background color
 	 * @return string the color coded string
 	 */

modules/minion/classes/Kohana/Minion/Exception.php

@@ -1,6 +1,6 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 /**
- * Minipn exception
+ * Minion exception
  *
  * @package    Kohana
  * @category   Minion
@@ -15,8 +15,6 @@ class Kohana_Minion_Exception extends Kohana_Exception {
 	 *
 	 * Should this display a stack trace? It's useful.
 	 *
-	 * Should this still log? Maybe not as useful since we'll see the error on the screen.
-	 *
 	 * @uses    Kohana_Exception::text
 	 * @param   Exception   $e
 	 * @return  boolean
@@ -25,6 +23,9 @@ class Kohana_Minion_Exception extends Kohana_Exception {
 	{
 		try
 		{
+			// Log the exception
+			Kohana_Exception::log($e);
+
 			if ($e instanceof Minion_Exception)
 			{
 				echo $e->format_for_cli();