deon/lnkohana
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Kohana v3.3.2

Browse Source
This commit is contained in:
Deon George
2014-09-06 23:43:07 +10:00
parent f96694b18f
commit 8888719653
236 changed files with 1685 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/minion/classes/Kohana/Minion/CLI.php
View File

@@ -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($command));
$password = shell_exec('cscript //nologo '.escapeshellarg($text));
// Remove temporary file.
unlink($vbscript);

4
modules/minion/classes/Kohana/Minion/Exception.php
View File

@@ -33,7 +33,7 @@ class Kohana_Minion_Exception extends Kohana_Exception {
{
echo Kohana_Exception::text($e);
}
$exit_code = $e->getCode();
// Never exit "0" after an exception.
@@ -59,6 +59,6 @@ class Kohana_Minion_Exception extends Kohana_Exception {
public function format_for_cli()
{
return Kohana_Exception::text($e);
return Kohana_Exception::text($this);
}
}

2
modules/minion/classes/Kohana/Minion/Task.php
View File

@@ -206,7 +206,7 @@ abstract class Kohana_Minion_Task {
public function build_validation(Validation $validation)
{
// Add a rule to each key making sure it's in the task
foreach ($validation->as_array() as $key => $value)
foreach ($validation->data() as $key => $value)
{
$validation->rule($key, array($this, 'valid_option'), array(':validation', ':field'));
}