[Bps-public-commit] SD branch, master, updated. 47b999d0e4c971867748dd079bcb11705e029217

[spang at bestpractical.com]

The branch, master has been updated
       via  47b999d0e4c971867748dd079bcb11705e029217 (commit)
      from  6ea9d6bb28ee41b9630a175cbfb5015722086393 (commit)

Summary of changes:
 lib/App/SD/CLI/Command.pm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 47b999d0e4c971867748dd079bcb11705e029217
Author: Christine Spang <spang at bestpractical.com>
Date:   Thu Aug 6 11:59:15 2009 +0100

    Fix ticket attachment create: don't try to slurp from whatever's in @ARGV

diff --git a/lib/App/SD/CLI/Command.pm b/lib/App/SD/CLI/Command.pm
index bc95e20..fc5b5c2 100644
--- a/lib/App/SD/CLI/Command.pm
+++ b/lib/App/SD/CLI/Command.pm
@@ -28,6 +28,8 @@ sub get_content {
     my $self = shift;
     my %args = @_;
 
+    Prophet::CLI->end_pager();
+
     my $content;
     if (my $file = $self->delete_arg('file')) {
         my ( $vol, $dir, $name ) = File::Spec->splitpath( $file );
@@ -49,8 +51,8 @@ sub get_content {
         if (my $footer = $args{footer}) {
             $text .= $footer;
         }
-    
-           $content = $self->edit_text($text);
+
+        $content = $self->edit_text($text);
         # user aborted their text editor without changing anything; signify
         # this to the caller by returning nothing
         $content = '' if $content eq $text;
@@ -58,7 +60,7 @@ sub get_content {
         die "Tried to invoke an editor in a test script!";
     } else {
         print "Please type your $args{type} and press ctrl-d.\n";
-        $content = do { local $/; <> };
+        $content = do { local $/; <STDIN> };
     }
 
     chomp $content;

-----------------------------------------------------------------------