diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:44:51 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:44:51 +0200 |
| commit | e76217041ddcae80f11b50b44a7d409b6722ad40 (patch) | |
| tree | 6f7dd444bfc5b4206a6e07169ad3c05b9b63fa4d /system/libraries/Table.php | |
| parent | 9c07c3697bab0bf43e10daf59068497dd3a0a9fd (diff) | |
| parent | cf728703b5852591c160cbd9566a0e508dd5759a (diff) | |
Merge branch '3.1-stable'
Diffstat (limited to 'system/libraries/Table.php')
| -rw-r--r-- | system/libraries/Table.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Table.php b/system/libraries/Table.php index fef9bb039..50c5e358b 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -435,7 +435,7 @@ class CI_Table { /** * 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) |