reverted the last change for now

diff --git a/pear/Console/Getopt.php b/pear/Console/Getopt.php
index 7b30c456be43a32d85fa58b5e901df59ed60a767..994492ae3a1351c222fcf90e128c83daa469a677 100644 (file)
--- a/pear/Console/Getopt.php
+++ b/pear/Console/Getopt.php
@@ -86,10 +86,10 @@ class Console_Getopt {
             }
 
             if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) {
-                //$non_opts[] = $arg;
-                $non_opts = array_merge($non_opts, array_slice($args, $i));
-                break;
-            } else if (strlen($arg) > 1 && $arg{1} == '-') {
+                $non_opts[] = $arg;
+                //$non_opts = array_merge($non_opts, array_slice($args, $i));
+                //break;
+            } elseif (strlen($arg) > 1 && $arg{1} == '-') {
                 $error = Console_Getopt::_parseLongOption(substr($arg, 2), $long_options, $opts, $args);
                 if (PEAR::isError($error))
                     return $error;