diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-22 08:17:16 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-22 08:17:16 +0100 |
| commit | 17e2024962b84f759b1f2bfb13564d6626f0d6f0 (patch) | |
| tree | 70c20452176bfce76ef5a34b698e6ac615f66c23 /lib | |
| parent | e3887f042ba1309985e58ce553de0de05227dc56 (diff) | |
| parent | 19d6e36039318cdb1f9aa9e0c4731b500b3b0aeb (diff) | |
Merge branch 'release/0.6.3' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/request/show.rhtml
spec/models/info_request_spec.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/alaveteli_external_command.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/alaveteli_external_command.rb b/lib/alaveteli_external_command.rb index b1d4f17d1..7d32be904 100644 --- a/lib/alaveteli_external_command.rb +++ b/lib/alaveteli_external_command.rb @@ -30,7 +30,7 @@ module AlaveteliExternalCommand if opts.has_key? :append_to xc.out = opts[:append_to] end - xc.run(opts[:stdin_string], opts[:env] || {}) + xc.run(opts[:stdin_string] || "", opts[:env] || {}) if xc.status != 0 # Error $stderr.puts("Error from #{program_name} #{args.join(' ')}:") |