Merge pull request #4826 from gxgpet/develop2

Make CI_Table::clear() reset captions

2 files changed, 4 insertions, 1 deletions

diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index f2fa434d9..2f1b3b414 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -427,6 +427,7 @@ class CI_Table {
 		$this->rows = array();
 		$this->heading = array();
 		$this->auto_heading = TRUE;
+		$this->caption = NULL;
 		return $this;
 	}
 
diff --git a/user_guide_src/source/libraries/table.rst b/user_guide_src/source/libraries/table.rst
index 91ae1ae8d..3cd120f95 100644
--- a/user_guide_src/source/libraries/table.rst
+++ b/user_guide_src/source/libraries/table.rst
@@ -275,11 +275,12 @@ Class Reference
 		:returns:	CI_Table instance (method chaining)
 		:rtype:	CI_Table
 
-		Lets you clear the table heading and row data. If you need to show multiple tables with different data you should to call this method
+		Lets you clear the table heading, row data and the caption. If you need to show multiple tables with different data you should to call this method
 		after each table has been generated to clear the previous table information. Example::
 
 			$this->load->library('table');
 
+			$this->table->set_caption('Preferences');
 			$this->table->set_heading('Name', 'Color', 'Size');
 			$this->table->add_row('Fred', 'Blue', 'Small');
 			$this->table->add_row('Mary', 'Red', 'Large');
@@ -289,6 +290,7 @@ Class Reference
 
 			$this->table->clear();
 
+			$this->table->set_caption('Shipping');
 			$this->table->set_heading('Name', 'Day', 'Delivery');
 			$this->table->add_row('Fred', 'Wednesday', 'Express');
 			$this->table->add_row('Mary', 'Monday', 'Air');