Merge pull request #4275 from paulbalandan/bugfix/view-table

Fix incomplete fillup of table template

Author: paulbalandan

system/View/Table.php

@@ -98,8 +98,6 @@ public function __construct($config = [])
 		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Set the template
 	 *
@@ -117,8 +115,6 @@ public function setTemplate($template)
 		return true;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Set the table heading
 	 *
@@ -145,8 +141,6 @@ public function setFooting()
 		return $this;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Set columns. Takes a one-dimensional array as input and creates
 	 * a multi-dimensional array with a depth equal to the number of
@@ -194,8 +188,6 @@ public function makeColumns($array = [], $columnLimit = 0)
 		return $new;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Set "empty" cells
 	 *
@@ -210,8 +202,6 @@ public function setEmpty($value)
 		return $this;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Add a table row
 	 *
@@ -225,8 +215,6 @@ public function addRow()
 		return $this;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Prep Args
 	 *
@@ -256,8 +244,6 @@ protected function _prepArgs(array $args)
 		return $args;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Add a table caption
 	 *
@@ -270,8 +256,6 @@ public function setCaption($caption)
 		return $this;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Generate the table
 	 *
@@ -425,8 +409,6 @@ public function generate($tableData = null)
 		return $out;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Clears the table arrays.  Useful if multiple tables are being generated
 	 *
@@ -442,8 +424,6 @@ public function clear()
 		return $this;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Set table data from a database result object
 	 *
@@ -453,7 +433,7 @@ public function clear()
 	protected function _setFromDBResult($object)
 	{
 		// First generate the headings from the table column names
-		if ($this->autoHeading === true && empty($this->heading))
+		if ($this->autoHeading && empty($this->heading))
 		{
 			$this->heading = $this->_prepArgs($object->getFieldNames());
 		}
@@ -464,17 +444,16 @@ protected function _setFromDBResult($object)
 		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Set table data from an array
 	 *
-	 * @param  array $data
+	 * @param array $data
+	 *
 	 * @return void
 	 */
 	protected function _setFromArray($data)
 	{
-		if ($this->autoHeading === true && empty($this->heading))
+		if ($this->autoHeading && empty($this->heading))
 		{
 			$this->heading = $this->_prepArgs(array_shift($data));
 		}
@@ -485,8 +464,6 @@ protected function _setFromArray($data)
 		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Compile Template
 	 *
@@ -500,18 +477,15 @@ protected function _compileTemplate()
 			return;
 		}
 
-		$temp = $this->_defaultTemplate();
-		foreach (['table_open', 'thead_open', 'thead_close', 'heading_row_start', 'heading_row_end', 'heading_cell_start', 'heading_cell_end', 'tbody_open', 'tbody_close', 'row_start', 'row_end', 'cell_start', 'cell_end', 'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end', 'table_close'] as $val)
+		foreach ($this->_defaultTemplate() as $field => $template)
 		{
-			if (! isset($this->template[$val]))
+			if (! isset($this->template[$field]))
 			{
-				$this->template[$val] = $temp[$val];
+				$this->template[$field] = $template;
 			}
 		}
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Default Template
 	 *
@@ -546,6 +520,4 @@ protected function _defaultTemplate()
 			'table_close'        => '</table>',
 		];
 	}
-
-	// --------------------------------------------------------------------
 }