fix: change pattern to ignore attribute exists in header and footer

Author: ddevsr

system/View/Table.php

@@ -295,7 +295,7 @@ public function generate($tableData = null)
 
         // Is there a table heading to display?
         if (! empty($this->heading)) {
-            preg_match('/(<)(td|th)/i', $this->template['heading_cell_start'], $valueHead);
+            preg_match('/(<)(td|th)(?=\h|>)/i', $this->template['heading_cell_start'], $valueHead);
             $strHeading = count($valueHead) === 3 ? $valueHead[1] . $valueHead[2] : null;
 
             $out .= $this->template['thead_open'] . $this->newline . $this->template['heading_row_start'] . $this->newline;
@@ -304,8 +304,8 @@ public function generate($tableData = null)
                 $temp = $this->template['heading_cell_start'];
 
                 foreach ($heading as $key => $val) {
-                    if ($key !== 'data') {
-                        $temp = $strHeading ? str_replace($strHeading, $strHeading . ' ' . $key . '="' . $val . '"', $temp) : $temp;
+                    if ($key !== 'data' && $strHeading !== null) {
+                        $temp = str_replace($strHeading, $strHeading . ' ' . $key . '="' . $val . '"', $temp);
                     }
                 }
 
@@ -359,7 +359,7 @@ public function generate($tableData = null)
         // Any table footing to display?
         if (! empty($this->footing)) {
             // Check if there is a th or td tag, null if not
-            preg_match('/(<)(td|th)/i', $this->template['footing_cell_start'], $valueFoot);
+            preg_match('/(<)(td|th)(?=\h|>)/i', $this->template['footing_cell_start'], $valueFoot);
             $strFooting = count($valueFoot) === 3 ? $valueFoot[1] . $valueFoot[2] : null;
 
             $out .= $this->template['tfoot_open'] . $this->newline . $this->template['footing_row_start'] . $this->newline;
@@ -368,8 +368,8 @@ public function generate($tableData = null)
                 $temp = $this->template['footing_cell_start'];
 
                 foreach ($footing as $key => $val) {
-                    if ($key !== 'data') {
-                        $temp = $strFooting ? str_replace($strFooting, $strFooting . ' ' . $key . '="' . $val . '"', $temp) : $temp;
+                    if ($key !== 'data' && $strFooting !== null) {
+                        $temp = str_replace($strFooting, $strFooting . ' ' . $key . '="' . $val . '"', $temp);
                     }
                 }