Skip to content

Commit 1e00416

Browse files
kenjiskenjis
committed
Merge remote-tracking branch 'upstream/develop' into 4.5
2 parents 53d86e4 + 3bfe413 commit 1e00416

24 files changed

+46
-46
lines changed

‎user_guide_src/source/incoming/controllers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ Auto Routing (Improved)
185185
Since v4.2.0, the new more secure Auto Routing has been introduced.
186186

187187
.. note:: If you are familiar with Auto Routing, which was enabled by default
188-
from CodeIgniter 3 through 4.1.x, you can see the differences in
188+
from CodeIgniter 3.x through 4.1.x, you can see the differences in
189189
:ref:`ChangeLog v4.2.0 <v420-new-improved-auto-routing>`.
190190

191191
This section describes the functionality of the new auto-routing.

‎user_guide_src/source/incoming/routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ Auto Routing (Improved)
775775
Since v4.2.0, the new more secure Auto Routing has been introduced.
776776

777777
.. note:: If you are familiar with Auto Routing, which was enabled by default
778-
from CodeIgniter 3 through 4.1.x, you can see the differences in
778+
from CodeIgniter 3.x through 4.1.x, you can see the differences in
779779
:ref:`ChangeLog v4.2.0 <v420-new-improved-auto-routing>`.
780780

781781
When no defined route is found that matches the URI, the system will attempt to match that URI against the controllers and methods when Auto Routing is enabled.

‎user_guide_src/source/installation/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ or using `Composer <https://getcomposer.org>`_.
77
Which is right for you?
88

99
- We recommend the Composer installation because it keeps CodeIgniter up to date easily.
10-
- If you would like the simple "download & go" install that CodeIgniter3
10+
- If you would like the simple "download & go" install that CodeIgniter 3
1111
is known for, choose the manual installation.
1212

1313
However you choose to install and run CodeIgniter4, the latest

‎user_guide_src/source/installation/upgrade_4xx.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ Helpers
162162
- `String Helper <https://www.codeigniter.com/userguide3/helpers/string_helper.html>`_ functions
163163
in CI3 are included in :doc:`../helpers/text_helper` in CI4.
164164
- In CI4, ``redirect()`` is completely changed from CI3's.
165-
- `redirect() Documentation CodeIgniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
166-
- `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_
165+
- `redirect() Documentation CodeIgniter 3.x <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
166+
- `redirect() Documentation CodeIgniter 4.x <../general/common_functions.html#redirect>`_
167167
- In CI4, :php:func:`redirect()` returns a ``RedirectResponse`` instance instead of
168168
redirecting and terminating script execution. You must return it from Controllers
169169
or Controller Filters.

‎user_guide_src/source/installation/upgrade_configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Configuration
88
Documentations
99
==============
1010

11-
- `Config Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/config.html>`_
12-
- :doc:`Configuration Documentation CodeIgniter 4.X </general/configuration>`
11+
- `Config Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/config.html>`_
12+
- :doc:`Configuration Documentation CodeIgniter 4.x </general/configuration>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_controllers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Controllers
88
Documentations
99
==============
1010

11-
- `Controller Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/controllers.html>`_
12-
- :doc:`Controller Documentation CodeIgniter 4.X </incoming/controllers>`
11+
- `Controller Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/general/controllers.html>`_
12+
- :doc:`Controller Documentation CodeIgniter 4.x </incoming/controllers>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_database.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Database
88
Documentations
99
==============
1010

11-
- `Database Reference Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/database/index.html>`_
12-
- :doc:`Working with Databases Documentation CodeIgniter 4.X </database/index>`
11+
- `Database Reference Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/database/index.html>`_
12+
- :doc:`Working with Databases Documentation CodeIgniter 4.x </database/index>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_emails.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Emails
88
Documentations
99
==============
1010

11-
- `Email Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/email.html>`_
12-
- :doc:`Email Documentation CodeIgniter 4.X </libraries/email>`
11+
- `Email Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/email.html>`_
12+
- :doc:`Email Documentation CodeIgniter 4.x </libraries/email>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_encryption.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Encryption
88
Documentations
99
**************
1010

11-
- `Encryption Library Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/encryption.html>`_
12-
- :doc:`Encryption Service Documentation CodeIgniter 4.X </libraries/encryption>`
11+
- `Encryption Library Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/encryption.html>`_
12+
- :doc:`Encryption Service Documentation CodeIgniter 4.x </libraries/encryption>`
1313

1414
What has been changed
1515
*********************

‎user_guide_src/source/installation/upgrade_file_upload.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Upgrade Working with Uploaded Files
77

88
Documentations
99
==============
10-
- `File Uploading Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
11-
- :doc:`Working with Uploaded Files Documentation CodeIgniter 4.X </libraries/uploaded_files>`
10+
- `File Uploading Class Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
11+
- :doc:`Working with Uploaded Files Documentation CodeIgniter 4.x </libraries/uploaded_files>`
1212

1313
What has been changed
1414
=====================

‎user_guide_src/source/installation/upgrade_html_tables.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade HTML Tables
88
Documentations
99
==============
1010

11-
- `HTML Table Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/table.html>`_
12-
- :doc:`HTML Table Documentation CodeIgniter 4.X </outgoing/table>`
11+
- `HTML Table Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/table.html>`_
12+
- :doc:`HTML Table Documentation CodeIgniter 4.x </outgoing/table>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_images.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Image Manipulation Class
88
Documentations
99
==============
1010

11-
- `Image Manipulation Class Documentation CodeIgniter 3.X <https://www.codeigniter.com/userguide3/libraries/image_lib.html>`_
12-
- :doc:`Image Manipulation Class Documentation CodeIgniter 4.X <../libraries/images>`
11+
- `Image Manipulation Class Documentation CodeIgniter 3.x <https://www.codeigniter.com/userguide3/libraries/image_lib.html>`_
12+
- :doc:`Image Manipulation Class Documentation CodeIgniter 4.x <../libraries/images>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_localization.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Localization
88
Documentations
99
==============
1010

11-
- `Language Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/language.html>`_
12-
- :doc:`Localization Documentation CodeIgniter 4.X </outgoing/localization>`
11+
- `Language Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/language.html>`_
12+
- :doc:`Localization Documentation CodeIgniter 4.x </outgoing/localization>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_migrations.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Migrations
88
Documentations
99
==============
1010

11-
- `Database Migrations Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/migration.html>`_
12-
- :doc:`Database Migrations Documentation CodeIgniter 4.X </dbmgmt/migration>`
11+
- `Database Migrations Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/migration.html>`_
12+
- :doc:`Database Migrations Documentation CodeIgniter 4.x </dbmgmt/migration>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_models.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Models
88
Documentations
99
==============
1010

11-
- `Model Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/models.html>`_
12-
- :doc:`Model Documentation CodeIgniter 4.X </models/model>`
11+
- `Model Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/general/models.html>`_
12+
- :doc:`Model Documentation CodeIgniter 4.x </models/model>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_pagination.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Pagination
88
Documentations
99
==============
1010

11-
- `Pagination Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/pagination.html>`_
12-
- :doc:`Pagination Documentation CodeIgniter 4.X </libraries/pagination>`
11+
- `Pagination Class Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/pagination.html>`_
12+
- :doc:`Pagination Documentation CodeIgniter 4.x </libraries/pagination>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_responses.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Upgrade HTTP Responses
77

88
Documentations
99
==============
10-
- `Output Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/output.html>`_
11-
- :doc:`HTTP Responses Documentation CodeIgniter 4.X </outgoing/response>`
10+
- `Output Class Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/output.html>`_
11+
- :doc:`HTTP Responses Documentation CodeIgniter 4.x </outgoing/response>`
1212

1313
What has been changed
1414
=====================

‎user_guide_src/source/installation/upgrade_routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Routing
88
Documentations
99
==============
1010

11-
- `URI Routing Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/routing.html>`_
12-
- :doc:`URI Routing Documentation CodeIgniter 4.X </incoming/routing>`
11+
- `URI Routing Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/general/routing.html>`_
12+
- :doc:`URI Routing Documentation CodeIgniter 4.x </incoming/routing>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Security
88
Documentations
99
==============
1010

11-
- `Security Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/security.html>`_
12-
- :doc:`Security Documentation CodeIgniter 4.X </libraries/security>`
11+
- `Security Class Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/security.html>`_
12+
- :doc:`Security Documentation CodeIgniter 4.x </libraries/security>`
1313

1414
.. note::
1515
If you use the :doc:`../helpers/form_helper` and enable the CSRF filter globally, then :php:func:`form_open()` will automatically insert a hidden CSRF field in your forms. So you do not have to upgrade this by yourself.

‎user_guide_src/source/installation/upgrade_sessions.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Sessions
88
Documentations
99
==============
1010

11-
- `Session Library Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/sessions.html>`_
12-
- :doc:`Session Library Documentation CodeIgniter 4.X </libraries/sessions>`
11+
- `Session Library Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/sessions.html>`_
12+
- :doc:`Session Library Documentation CodeIgniter 4.x </libraries/sessions>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_validations.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Validations
88
Documentations of Library
99
=========================
1010

11-
- `Form Validation Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/form_validation.html>`_
12-
- :doc:`Validation Documentation CodeIgniter 4.X </libraries/validation>`
11+
- `Form Validation Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/form_validation.html>`_
12+
- :doc:`Validation Documentation CodeIgniter 4.x </libraries/validation>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_view_parser.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade View Parser
88
Documentations
99
==============
1010

11-
- `Template Parser Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/parser.html>`_
12-
- :doc:`View Parser Documentation CodeIgniter 4.X </outgoing/view_parser>`
11+
- `Template Parser Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/libraries/parser.html>`_
12+
- :doc:`View Parser Documentation CodeIgniter 4.x </outgoing/view_parser>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/installation/upgrade_views.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Upgrade Views
88
Documentations
99
==============
1010

11-
- `View Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/views.html>`_
12-
- :doc:`View Documentation CodeIgniter 4.X </outgoing/views>`
11+
- `View Documentation CodeIgniter 3.x <http://codeigniter.com/userguide3/general/views.html>`_
12+
- :doc:`View Documentation CodeIgniter 4.x </outgoing/views>`
1313

1414
What has been changed
1515
=====================

‎user_guide_src/source/libraries/uploaded_files.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Working with Uploaded Files
55
CodeIgniter makes working with files uploaded through a form much simpler and more secure than using PHP's ``$_FILES``
66
array directly. This extends the :doc:`File class </libraries/files>` and thus gains all of the features of that class.
77

8-
.. note:: This is not the same as the File Uploading class in CodeIgniter v3.x. This provides a raw
9-
interface to the uploaded files with a few small features.
8+
.. note:: This is not the same as the File Uploading class in CodeIgniter 3.
9+
This provides a raw interface to the uploaded files with a few small features.
1010

1111
.. contents::
1212
:local:
@@ -309,7 +309,7 @@ getClientPath()
309309

310310
.. versionadded:: 4.4.0
311311

312-
Returns the `webkit relative path <https://developer.mozilla.org/en-US/docs/Web/API/File/webkitRelativePath>`_ of the uploaded file when the client has uploaded files via directory upload.
312+
Returns the `webkit relative path <https://developer.mozilla.org/en-US/docs/Web/API/File/webkitRelativePath>`_ of the uploaded file when the client has uploaded files via directory upload.
313313
In PHP versions below 8.1, this returns ``null``
314314

315315
.. literalinclude:: uploaded_files/023.php

0 commit comments

Comments
 (0)