diff options
author | Andrey Andreev <narf@devilix.net> | 2019-01-08 16:55:37 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2019-01-08 16:55:37 +0100 |
commit | 7ec458b45316b9f270e1e03de498244f71c605ea (patch) | |
tree | a110bf9c71b49a69beec49d1874f423375cd0fd1 /user_guide_src/source/installation/upgrade_320.rst | |
parent | 67563c64025085e61598a83fef3e25bef38b32c4 (diff) | |
parent | 12ee9843877bf80159d1d89a0e3a4f170e902725 (diff) |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/database/drivers/sqlite/sqlite_driver.php
system/database/drivers/sqlite/sqlite_forge.php
system/database/drivers/sqlite/sqlite_result.php
system/database/drivers/sqlite/sqlite_utility.php
system/helpers/captcha_helper.php
system/helpers/email_helper.php
system/helpers/inflector_helper.php
system/helpers/smiley_helper.php
system/language/english/form_validation_lang.php
system/libraries/Cart.php
system/libraries/Form_validation.php
system/libraries/Javascript.php
system/libraries/Javascript/Jquery.php
system/libraries/Session/SessionHandlerInterface.php
tests/codeigniter/helpers/inflector_helper_test.php
user_guide_src/source/helpers/inflector_helper.rst
Diffstat (limited to 'user_guide_src/source/installation/upgrade_320.rst')
-rw-r--r-- | user_guide_src/source/installation/upgrade_320.rst | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/user_guide_src/source/installation/upgrade_320.rst b/user_guide_src/source/installation/upgrade_320.rst index a9dc274c7..3eadd8caf 100644 --- a/user_guide_src/source/installation/upgrade_320.rst +++ b/user_guide_src/source/installation/upgrade_320.rst @@ -257,14 +257,3 @@ so that if you're using the :doc:`Web Page Caching <../general/caching>` feature, you'll be left with some old, garbage cache files. That shouldn't be a problem, but you may want to clear them. - -Step 13: Check for calls to is_countable() -========================================== - - -PHP 7.3 introduces a native `is_countable() <https://secure.php.net/is_countable>`_ -function, which creates a name collision with the ``is_countable()`` function -we've had in our :doc:`Inflector Helpers <../helpers/inflector_helper>`. - -If you've been using the helper function in question, you should now rename -the calls to it to :php:func:`word_is_countable()`. |