cvs: pear /HTML_Table Table.php
| From: | Bertrand Mansion | Date: | Thu, 20 Jun 2002 10:47:03 +0000 |
| Subject: | cvs: pear /HTML_Table Table.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-4699@lists.php.net to get a copy of this message | ||
mansion Thu Jun 20 06:47:03 2002 EDT
Modified files:
/pear/HTML_Table Table.php
Log:
Removed tabs inside of table cells (td). Was messing the display with some browsers.
Index: pear/HTML_Table/Table.php
diff -u pear/HTML_Table/Table.php:1.1 pear/HTML_Table/Table.php:1.2
--- pear/HTML_Table/Table.php:1.1 Tue May 28 04:32:33 2002
+++ pear/HTML_Table/Table.php Thu Jun 20 06:47:03 2002
@@ -17,7 +17,7 @@
// | Bertrand Mansion <bmansion@mamasam.com> |
// +----------------------------------------------------------------------+
//
-// $Id: Table.php,v 1.1 2002/05/28 08:32:33 mansion Exp $
+// $Id: Table.php,v 1.2 2002/06/20 10:47:03 mansion Exp $
require_once "PEAR.php";
require_once "HTML/Common.php";
@@ -530,13 +530,11 @@
} else {
$contents = "";
}
- $flagCloseTable = false;
$strHtml .= $tabs . "\t\t<$type" . $this->_getAttrString($attr) .
">";
if (is_object($contents)) {
if (is_subclass_of($contents, "html_common")) {
$contents->setTabOffset($this->_tabOffset + 3);
$contents->_nestLevel = $this->_nestLevel + 1;
- $flagCloseTable = true;
}
if (method_exists($contents, "toHtml")) {
$contents = $contents->toHtml();
@@ -549,7 +547,6 @@
if (isset($this->_autoFill) && $contents == "")
$contents = $this->_autoFill;
$strHtml .= $contents;
- $strHtml .= (isset($flagCloseTable)) ? "\t\t" : '';
$strHtml .= "</$type>\n";
}
$strHtml .= $tabs ."\t</tr>\n";
@@ -595,7 +592,6 @@
/**
* Adjusts ends (total number of rows and columns)
-<<<<<<< Table.php
* @param int $row Row index
* @param int $col Column index
* @param string $method Method name of caller
@@ -604,17 +600,6 @@
* Default is an empty array.
* @access private
* @throws PEAR_Error
-=======
- *
- * @param int $row Row index
- * @param int $col Column index
- * @param string $method Method name of caller
- * Used to populate PEAR_Error if thrown.
- * @param array $attributes Assoc array of attributes
- * Default is an empty array.
- * @access private
- * @throws PEAR_Error
->>>>>>> 1.14
*/
function _adjustEnds($row, $col, $method, $attributes = array())
{