* don't cut lines when wrapping output

stigsb · stigsb · commit 2fd0f86c739b · 2004-02-15T17:43:00.000Z
diff --git a/pear/PEAR/Frontend/CLI.php b/pear/PEAR/Frontend/CLI.php
@@ -219,7 +219,7 @@ function _tableRow($columns, $rowparams = array(), $colparams = array())
         for ($i = 0; $i < sizeof($columns); $i++) {
             $col = &$columns[$i];
             if (isset($colparams[$i]) && !empty($colparams[$i]['wrap'])) {
-                $col = wordwrap($col, $colparams[$i]['wrap'], "\n", 1);
+                $col = wordwrap($col, $colparams[$i]['wrap'], "\n", 0);
             }
             if (strpos($col, "\n") !== false) {
                 $multiline = explode("\n", $col);
@@ -349,6 +349,9 @@ function _endTable()
 
                     $rowtext .= $cellstart . $cell . $cellend;
                 }
+                if (!$border) {
+                    $rowtext = rtrim($rowtext);
+                }
                 $rowtext .= $rowend;
                 $this->_displayLine($rowtext);
             }

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ function _tableRow($columns, $rowparams = array(), $colparams = array())`
`219`	`219`	`for ($i = 0; $i < sizeof($columns); $i++) {`
`220`	`220`	`$col = &$columns[$i];`
`221`	`221`	`if (isset($colparams[$i]) && !empty($colparams[$i]['wrap'])) {`
`222`		`- $col = wordwrap($col, $colparams[$i]['wrap'], "\n", 1);`
	`222`	`+ $col = wordwrap($col, $colparams[$i]['wrap'], "\n", 0);`
`223`	`223`	`}`
`224`	`224`	`if (strpos($col, "\n") !== false) {`
`225`	`225`	`$multiline = explode("\n", $col);`
`@@ -349,6 +349,9 @@ function _endTable()`
`349`	`349`
`350`	`350`	`$rowtext .= $cellstart . $cell . $cellend;`
`351`	`351`	`}`
	`352`	`+ if (!$border) {`
	`353`	`+ $rowtext = rtrim($rowtext);`
	`354`	`+ }`
`352`	`355`	`$rowtext .= $rowend;`
`353`	`356`	`$this->_displayLine($rowtext);`
`354`	`357`	`}`