commit ee9d428171dc201f51eaffdb62616312915681ff
author Andrey Andreev <narf@devilix.net> Mon Jun 05 10:44:37 2017 +0300
committer Andrey Andreev <narf@devilix.net> Mon Jun 05 10:45:35 2017 +0300
tree a27f7d05c362dafe6b901da2ed854e44f665502e
parent ab0010f543d88fa19506907684a9d329d4dd94e3

[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nits

Fix misc inconsistencies between code and doc comments

system/libraries/Table.php

diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index fef9bb0..50c5e35 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -435,7 +435,7 @@
 	/**
 	 * Set table data from a database result object
 	 *
-	 * @param	CI_DB_result	$db_result	Database result object
+	 * @param	CI_DB_result	$object	Database result object
 	 * @return	void
 	 */
 	protected function _set_from_db_result($object)