diff options
| -rw-r--r-- | system/database/DB_driver.php | 9 | ||||
| -rw-r--r-- | system/helpers/form_helper.php | 1 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/email.rst | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 18dbbc76e..04490c824 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1208,13 +1208,8 @@ abstract class CI_DB_driver { } else { - /* We have no other choice but to just get the first element's key. - * Due to array_shift() accepting it's argument by reference, if - * E_STRICT is on, this would trigger a warning. So we'll have to - * assign it first. - */ - $key = array_keys($row); - $key = array_shift($key); + // We have no other choice but to just get the first element's key. + $key = key($row); } } diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index e2c0cc4c5..2002d4269 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -261,7 +261,6 @@ if ( ! function_exists('form_textarea')) unset($data['value']); // textareas don't use the value attribute } - $name = is_array($data) ? $data['name'] : $data; return '<textarea '._parse_form_attributes($data, $defaults).$extra.'>'.form_prep($val, TRUE)."</textarea>\n"; } } diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index a55f1895d..39629ece1 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -43,7 +43,7 @@ This example assumes you are sending the email from one of your Setting Email Preferences ========================= -There are 17 different preferences available to tailor how your email +There are 21 different preferences available to tailor how your email messages are sent. You can either set them manually as described here, or automatically via preferences stored in your config file, described below: |