From 4131d42c793c3db50b6184e5084332d5415c91cb Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 25 Sep 2017 19:47:49 +0300 Subject: [ci skip] Mark the start of 3.1.7-dev --- user_guide_src/source/changelog.rst | 6 ++++++ user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 3 ++- user_guide_src/source/installation/upgrade_317.rst | 14 ++++++++++++++ user_guide_src/source/installation/upgrading.rst | 1 + 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 user_guide_src/source/installation/upgrade_317.rst (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index e5387cc5a..b99a709ad 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,6 +2,12 @@ Change Log ########## +Version 3.1.7 +============= + +Release Date: Not Released + + Version 3.1.6 ============= diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 7929f8ae7..e2b1c2972 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2017, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.6' +version = '3.1.7-dev' # The full version, including alpha/beta/rc tags. -release = '3.1.6' +release = '3.1.7-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 76335bb67..bb7534d91 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,8 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.6 (Current version) `_ +- `CodeIgniter v3.1.7-dev (Current version) `_ +- `CodeIgniter v3.1.6 `_ - `CodeIgniter v3.1.5 `_ - `CodeIgniter v3.1.4 `_ - `CodeIgniter v3.1.3 `_ diff --git a/user_guide_src/source/installation/upgrade_317.rst b/user_guide_src/source/installation/upgrade_317.rst new file mode 100644 index 000000000..93c37b687 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_317.rst @@ -0,0 +1,14 @@ +############################# +Upgrading from 3.1.6 to 3.1.7 +############################# + +Before performing an update you should take your site offline by +replacing the index.php file with a static one. + +Step 1: Update your CodeIgniter files +===================================== + +Replace all files and directories in your *system/* directory. + +.. note:: If you have any custom developed files in these directories, + please make copies of them first. diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index 991d5cf4c..1cc249869 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -8,6 +8,7 @@ upgrading from. .. toctree:: :titlesonly: + Upgrading from 3.1.6 to 3.1.7 Upgrading from 3.1.5 to 3.1.6 Upgrading from 3.1.4 to 3.1.5 Upgrading from 3.1.3 to 3.1.4 -- cgit v1.2.3-24-g4f1b From a9194650e6ae387be29aacfdf4b1b27a5c60ca34 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 27 Sep 2017 18:57:46 +0300 Subject: Fix #5276 --- user_guide_src/source/changelog.rst | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index b99a709ad..2dd77e389 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,11 @@ Version 3.1.7 Release Date: Not Released +Bug fixes for 3.1.7 +------------------- + +- Fixed a regression (#5276) - :doc:`Database Utilities ` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver. +- Fixed a regression where :doc:`Database Results ` method ``field_data()`` returned incorrect type names. Version 3.1.6 ============= -- cgit v1.2.3-24-g4f1b From 6b08edf5d6ab24310460147a1c9785b80eca6304 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 29 Sep 2017 12:04:38 +0300 Subject: Add testcase and changelog entry for #5278 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 2dd77e389..1c71b09ef 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -12,6 +12,7 @@ Bug fixes for 3.1.7 - Fixed a regression (#5276) - :doc:`Database Utilities ` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver. - Fixed a regression where :doc:`Database Results ` method ``field_data()`` returned incorrect type names. +- Fixed a bug (#5278) - :doc:`URL Helper ` function :php:func:`auto_link()` didn't detect trailing slashes in URLs. Version 3.1.6 ============= -- cgit v1.2.3-24-g4f1b From 9bba3aeca2b45728009e573e4d45a6ef760d5c33 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 3 Oct 2017 14:21:36 +0300 Subject: [ci skip] Add changelog entry for #5282 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 1c71b09ef..c762df744 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -13,6 +13,7 @@ Bug fixes for 3.1.7 - Fixed a regression (#5276) - :doc:`Database Utilities ` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver. - Fixed a regression where :doc:`Database Results ` method ``field_data()`` returned incorrect type names. - Fixed a bug (#5278) - :doc:`URL Helper ` function :php:func:`auto_link()` didn't detect trailing slashes in URLs. +- Fixed a regression (#5282) - :doc:`Query Builder ` method ``count_all_results()`` breaks ``ORDER BY`` clauses for subsequent queries. Version 3.1.6 ============= -- cgit v1.2.3-24-g4f1b From 4c679b5e7c2363c2c815e310e31e0f982dba3863 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 4 Oct 2017 12:12:26 +0300 Subject: [ci skip] Fix a typo in pagination docs --- user_guide_src/source/libraries/pagination.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst index 99b5a80a2..fbc75ea56 100644 --- a/user_guide_src/source/libraries/pagination.rst +++ b/user_guide_src/source/libraries/pagination.rst @@ -128,7 +128,7 @@ the offset segment. **$config['suffix'] = '';** -A custom suffix added to the path. The sufix value will be right after +A custom suffix added to the path. The suffix value will be right after the offset segment. **$config['use_global_url_suffix'] = FALSE;** @@ -311,4 +311,4 @@ Class Reference :returns: HTML-formatted pagination :rtype: string - Returns a "pagination" bar, containing the generated links or an empty string if there's just a single page. \ No newline at end of file + Returns a "pagination" bar, containing the generated links or an empty string if there's just a single page. -- cgit v1.2.3-24-g4f1b From 23aa166a7bef428cbbb06b3f6f7a3fa9f0e78524 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 9 Oct 2017 10:57:57 +0300 Subject: [ci skip] Merge pull request #5292 from ajdunn2/develop Small spelling fix --- user_guide_src/source/database/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index e231a7d6a..a9bf7dcb6 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -186,7 +186,7 @@ Explanation of Values: - 'ssl_key' - Path to the private key file - 'ssl_cert' - Path to the public key certificate file - 'ssl_ca' - Path to the certificate authority file - - 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format + - 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format - 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':') - 'ssl_verify' - TRUE/FALSE; Whether to verify the server certificate or not ('mysqli' only) -- cgit v1.2.3-24-g4f1b From 2e0247aac56f7076705211fb8845101697e62c05 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 9 Oct 2017 11:00:03 +0300 Subject: [ci skip] Merge pull request #5295 from mamat-rahmat/fix-docs-code-block Fix broken .htaccess example code-block --- user_guide_src/source/general/urls.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst index e23554907..b8a1b9f5b 100644 --- a/user_guide_src/source/general/urls.rst +++ b/user_guide_src/source/general/urls.rst @@ -42,9 +42,9 @@ By default, the **index.php** file will be included in your URLs:: If your Apache server has *mod_rewrite* enabled, you can easily remove this file by using a .htaccess file with some simple rules. Here is an example of such a file, using the "negative" method in which everything is redirected -except the specified items:: +except the specified items: -.. code-block:: console +.. code-block:: apache RewriteEngine On RewriteCond %{REQUEST_FILENAME} !-f -- cgit v1.2.3-24-g4f1b From fa2a0c58eb0f6421e3819df8a8873b5a5e4ebb58 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 13 Oct 2017 17:04:35 +0300 Subject: Fix #5297 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index c762df744..d222e17fb 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -14,6 +14,7 @@ Bug fixes for 3.1.7 - Fixed a regression where :doc:`Database Results ` method ``field_data()`` returned incorrect type names. - Fixed a bug (#5278) - :doc:`URL Helper ` function :php:func:`auto_link()` didn't detect trailing slashes in URLs. - Fixed a regression (#5282) - :doc:`Query Builder ` method ``count_all_results()`` breaks ``ORDER BY`` clauses for subsequent queries. +- Fixed a bug (#5279) - :doc:`Query Builder ` didn't account for already escaped identifiers while applying database name prefixes. Version 3.1.6 ============= -- cgit v1.2.3-24-g4f1b From d282d07dfba94b5395d1dd989bdb958c972bb7cf Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 16 Oct 2017 11:05:58 +0300 Subject: [ci skip] Use INTL_IDNA_VARIANT_UCS46 to convert non-ASCII domain names in emails Close #5300 --- user_guide_src/source/changelog.rst | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index d222e17fb..647fe4817 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,11 @@ Version 3.1.7 Release Date: Not Released +- General Changes + + - Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names. + - Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names. + Bug fixes for 3.1.7 ------------------- -- cgit v1.2.3-24-g4f1b From 211d23d31bd33d857377bdb13abdc104772164ff Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 25 Oct 2017 18:03:05 +0300 Subject: [ci skip] Merge pull request #5311 from gonzalo-massa/gonzalo-massa-patch-1 Download links for versions 2.2.4 to 2.2.6 added to docs --- user_guide_src/source/installation/downloads.rst | 3 +++ 1 file changed, 3 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index bb7534d91..34e654078 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -17,6 +17,9 @@ Downloading CodeIgniter - `CodeIgniter v3.0.2 `_ - `CodeIgniter v3.0.1 `_ - `CodeIgniter v3.0.0 `_ +- `CodeIgniter v2.2.6 `_ +- `CodeIgniter v2.2.5 `_ +- `CodeIgniter v2.2.4 `_ - `CodeIgniter v2.2.3 `_ - `CodeIgniter v2.2.2 `_ - `CodeIgniter v2.2.1 `_ -- cgit v1.2.3-24-g4f1b From 44aa1ab0655283b67d6fdcb081803f25453dbc73 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 7 Nov 2017 15:42:53 +0200 Subject: [ci skip] Deprecate extra parameters of the CAPTCHA helper --- user_guide_src/source/changelog.rst | 1 + user_guide_src/source/helpers/captcha_helper.rst | 12 ++++++++---- user_guide_src/source/installation/upgrade_317.rst | 13 +++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 647fe4817..1793108d8 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -11,6 +11,7 @@ Release Date: Not Released - Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names. - Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names. + - Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``. Bug fixes for 3.1.7 ------------------- diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index 986c1d3e1..be1b20aaf 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -135,9 +135,9 @@ The following functions are available: .. php:function:: create_captcha([$data = ''[, $img_path = ''[, $img_url = ''[, $font_path = '']]]]) :param array $data: Array of data for the CAPTCHA - :param string $img_path: Path to create the image in - :param string $img_url: URL to the CAPTCHA image folder - :param string $font_path: Server path to font + :param string $img_path: Path to create the image in (DEPRECATED) + :param string $img_url: URL to the CAPTCHA image folder (DEPRECATED) + :param string $font_path: Server path to font (DEPRECATED) :returns: array('word' => $word, 'time' => $now, 'image' => $img) :rtype: array @@ -161,4 +161,8 @@ The following functions are available: file extension. It will be a number like this: 1139612155.3422 The **word** is the word that appears in the captcha image, which if not - supplied to the function, will be a random string. \ No newline at end of file + supplied to the function, will be a random string. + + .. note:: Usage of the ``$img_path``, ``$img_url`` and ``$font_path`` + parameters is DEPRECATED. Provide them in the ``$data`` array + instead. diff --git a/user_guide_src/source/installation/upgrade_317.rst b/user_guide_src/source/installation/upgrade_317.rst index 93c37b687..dc1ee1868 100644 --- a/user_guide_src/source/installation/upgrade_317.rst +++ b/user_guide_src/source/installation/upgrade_317.rst @@ -12,3 +12,16 @@ Replace all files and directories in your *system/* directory. .. note:: If you have any custom developed files in these directories, please make copies of them first. + +Step 2: Remove usage of CAPTCHA helper extra parameters (deprecation) +===================================================================== + +The :doc:`CAPTCHA Helper <../helpers/captcha_helper>` function +:php:func:`create_captcha()` allows passing of its ``img_path``, ``img_url`` +and ``font_path`` options as the 2nd, 3rd and 4th parameters respectively. + +This kind of usage is now deprecated and you should just pass the options +in question as part of the first parameter array. + +.. note:: The functionality in question is still available, but you're + strongly encouraged to remove its usage sooner rather than later. -- cgit v1.2.3-24-g4f1b From 4541bf930e715917622dc2d225bf5517f99db35a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 9 Nov 2017 17:27:59 +0200 Subject: [ci skip] Fix patch for #5300 --- user_guide_src/source/changelog.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 1793108d8..eb879c5a8 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -9,8 +9,8 @@ Release Date: Not Released - General Changes - - Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names. - - Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names. + - Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. + - Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. - Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``. Bug fixes for 3.1.7 -- cgit v1.2.3-24-g4f1b From 8c9e51044d991868228dba8b9d5141998347dbfe Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 10 Nov 2017 15:02:42 +0200 Subject: Fix #5331 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index eb879c5a8..1641f7c97 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -21,6 +21,7 @@ Bug fixes for 3.1.7 - Fixed a bug (#5278) - :doc:`URL Helper ` function :php:func:`auto_link()` didn't detect trailing slashes in URLs. - Fixed a regression (#5282) - :doc:`Query Builder ` method ``count_all_results()`` breaks ``ORDER BY`` clauses for subsequent queries. - Fixed a bug (#5279) - :doc:`Query Builder ` didn't account for already escaped identifiers while applying database name prefixes. +- Fixed a bug (#5331) - :doc:`URL Helper ` function :php:func:`auto_link()` converted e-mail addresses starting with 'www.' to both "url" and "email" links. Version 3.1.6 ============= -- cgit v1.2.3-24-g4f1b From c9420849853a33a192c482e28c737e166d4fa698 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 10 Nov 2017 15:12:04 +0200 Subject: Close #5330 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 1641f7c97..1c35d9046 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -11,6 +11,7 @@ Release Date: Not Released - Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. - Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. + - Updated :doc:`Loader Library ` method ``model()`` to log both ``CI_Model`` class loading and individual models' initialization. - Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``. Bug fixes for 3.1.7 -- cgit v1.2.3-24-g4f1b From 4a567782a2ece1ceffebfc1efa580f654df8be1f Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 20 Nov 2017 09:58:03 +0200 Subject: [ci skip] More docs updates following #5330 --- user_guide_src/source/general/controllers.rst | 2 +- user_guide_src/source/general/core_classes.rst | 9 ++------- user_guide_src/source/general/creating_libraries.rst | 3 ++- user_guide_src/source/general/models.rst | 14 +------------- user_guide_src/source/libraries/sessions.rst | 4 ++-- 5 files changed, 8 insertions(+), 24 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst index 5a111d8dc..14e583636 100644 --- a/user_guide_src/source/general/controllers.rst +++ b/user_guide_src/source/general/controllers.rst @@ -337,4 +337,4 @@ list. That's it! ========== -That, in a nutshell, is all there is to know about controllers. \ No newline at end of file +That, in a nutshell, is all there is to know about controllers. diff --git a/user_guide_src/source/general/core_classes.rst b/user_guide_src/source/general/core_classes.rst index 79f73ef06..9ccded75c 100644 --- a/user_guide_src/source/general/core_classes.rst +++ b/user_guide_src/source/general/core_classes.rst @@ -83,6 +83,7 @@ application/core/MY_Input.php, and declare your class with:: public function __construct() { parent::__construct(); + // Your own constructor code } } @@ -98,12 +99,6 @@ your new class in your application controller's constructors. class Welcome extends MY_Controller { - public function __construct() - { - parent::__construct(); - // Your own constructor code - } - public function index() { $this->load->view('welcome_message'); @@ -119,4 +114,4 @@ To set your own sub-class prefix, open your $config['subclass_prefix'] = 'MY_'; Please note that all native CodeIgniter libraries are prefixed -with CI\_ so DO NOT use that as your prefix. \ No newline at end of file +with CI\_ so DO NOT use that as your prefix. diff --git a/user_guide_src/source/general/creating_libraries.rst b/user_guide_src/source/general/creating_libraries.rst index d6b0631af..83742b619 100644 --- a/user_guide_src/source/general/creating_libraries.rst +++ b/user_guide_src/source/general/creating_libraries.rst @@ -224,6 +224,7 @@ extend the parent constructor:: public function __construct($config = array()) { parent::__construct($config); + // Your own constructor code } } @@ -256,4 +257,4 @@ To set your own sub-class prefix, open your $config['subclass_prefix'] = 'MY_'; Please note that all native CodeIgniter libraries are prefixed with CI\_ -so DO NOT use that as your prefix. \ No newline at end of file +so DO NOT use that as your prefix. diff --git a/user_guide_src/source/general/models.rst b/user_guide_src/source/general/models.rst index eb842e927..0b20164e9 100644 --- a/user_guide_src/source/general/models.rst +++ b/user_guide_src/source/general/models.rst @@ -67,12 +67,6 @@ The basic prototype for a model class is this:: class Model_name extends CI_Model { - public function __construct() - { - parent::__construct(); - // Your own constructor code - } - } Where **Model_name** is the name of your class. Class names **must** have @@ -83,12 +77,6 @@ The file name must match the class name. For example, if this is your class:: class User_model extends CI_Model { - public function __construct() - { - parent::__construct(); - // Your own constructor code - } - } Your file will be this:: @@ -176,4 +164,4 @@ database. The following options for connecting are available to you: $config['pconnect'] = FALSE; $config['db_debug'] = TRUE; - $this->load->model('model_name', '', $config); \ No newline at end of file + $this->load->model('model_name', '', $config); diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index b1f658d8f..994dc2e08 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -757,8 +757,8 @@ when creating a session driver for CodeIgniter: `_ interface. .. note:: You may notice that ``SessionHandlerInterface`` is provided - by PHP since version 5.4.0. CodeIgniter will automatically declare - the same interface if you're running an older PHP version. + by PHP since version 5.4.0. CodeIgniter will automatically declare + the same interface if you're running an older PHP version. The link will explain why and how. -- cgit v1.2.3-24-g4f1b From cf0e3e336ee872f1304bf0d19d39cc051db6c041 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Nov 2017 13:16:48 +0200 Subject: [ci skip] Add changelog entry for PR #5342 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 1c35d9046..c53f30f26 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -12,6 +12,7 @@ Release Date: Not Released - Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. - Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. - Updated :doc:`Loader Library ` method ``model()`` to log both ``CI_Model`` class loading and individual models' initialization. + - Updated :doc:`Pagination Library ` to preserve previously set attributes while calling ``initialize()``. - Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``. Bug fixes for 3.1.7 -- cgit v1.2.3-24-g4f1b From 9e2dcd4a6a70a997d8d741e8f113660f16b9a609 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 29 Nov 2017 12:59:45 +0200 Subject: [ci skip] Fix allow_get_array defaulting to FALSE if it doesn't exist --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index c53f30f26..ea201068b 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -24,6 +24,7 @@ Bug fixes for 3.1.7 - Fixed a regression (#5282) - :doc:`Query Builder ` method ``count_all_results()`` breaks ``ORDER BY`` clauses for subsequent queries. - Fixed a bug (#5279) - :doc:`Query Builder ` didn't account for already escaped identifiers while applying database name prefixes. - Fixed a bug (#5331) - :doc:`URL Helper ` function :php:func:`auto_link()` converted e-mail addresses starting with 'www.' to both "url" and "email" links. +- Fixed a bug where ``$config['allow_get_array']`` defaulted to ``FALSE`` if it didn't exist in the config file. Version 3.1.6 ============= -- cgit v1.2.3-24-g4f1b From 97e50f72d5920c13d15a0178f5065b06d6e53903 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 5 Jan 2018 17:32:38 +0200 Subject: [ci skip] Add changelog entry for PR #5369 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index ea201068b..619fa4651 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -13,6 +13,7 @@ Release Date: Not Released - Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names. - Updated :doc:`Loader Library ` method ``model()`` to log both ``CI_Model`` class loading and individual models' initialization. - Updated :doc:`Pagination Library ` to preserve previously set attributes while calling ``initialize()``. + - Updated :doc:`Cache Library ` to automatically add items to cache on ``increment()``, ``decrement()`` calls for missing keys. - Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``. Bug fixes for 3.1.7 -- cgit v1.2.3-24-g4f1b From cce6bd170f24cf0f10ca0b58150d0324433a66be Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 9 Jan 2018 11:32:02 +0200 Subject: [ci skip] Merge pull request #5376 from jim-parry/copyright-update Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php --- user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/license.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index e2b1c2972..a3d758ee8 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -41,7 +41,7 @@ master_doc = 'index' # General information about the project. project = u'CodeIgniter' -copyright = u'2014 - 2017, British Columbia Institute of Technology' +copyright = u'2014 - 2018, British Columbia Institute of Technology' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -229,7 +229,7 @@ man_pages = [ epub_title = u'CodeIgniter' epub_author = u'British Columbia Institute of Technology' epub_publisher = u'British Columbia Institute of Technology' -epub_copyright = u'2014 - 2017, British Columbia Institute of Technology' +epub_copyright = u'2014 - 2018, British Columbia Institute of Technology' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/user_guide_src/source/license.rst b/user_guide_src/source/license.rst index c943c294a..d65b56431 100644 --- a/user_guide_src/source/license.rst +++ b/user_guide_src/source/license.rst @@ -2,7 +2,7 @@ The MIT License (MIT) ##################### -Copyright (c) 2014 - 2017, British Columbia Institute of Technology +Copyright (c) 2014 - 2018, British Columbia Institute of Technology Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal -- cgit v1.2.3-24-g4f1b From 3185447a82a808e9c85c79b6ce12bcb7358c8de0 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 12 Jan 2018 12:39:29 +0200 Subject: [ci skip] Add changelog entry for PR #5379 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 619fa4651..c316da83f 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -26,6 +26,7 @@ Bug fixes for 3.1.7 - Fixed a bug (#5279) - :doc:`Query Builder ` didn't account for already escaped identifiers while applying database name prefixes. - Fixed a bug (#5331) - :doc:`URL Helper ` function :php:func:`auto_link()` converted e-mail addresses starting with 'www.' to both "url" and "email" links. - Fixed a bug where ``$config['allow_get_array']`` defaulted to ``FALSE`` if it didn't exist in the config file. +- Fixed a bug (#5379) - :doc:`Session Library ` would incorrectly fail to obtain a lock that it already has on PHP 7 with the 'memcached' driver. Version 3.1.6 ============= -- cgit v1.2.3-24-g4f1b From f0b9735d5857e6c07c8f5824b13cff4828db3cfe Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 13 Jan 2018 13:54:38 +0200 Subject: [ci skip] Prepare 3.1.7 release --- user_guide_src/source/changelog.rst | 2 +- user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index c316da83f..e23517a86 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -5,7 +5,7 @@ Change Log Version 3.1.7 ============= -Release Date: Not Released +Release Date: Jan 13, 2018 - General Changes diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index a3d758ee8..fbd81c47e 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2018, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.7-dev' +version = '3.1.7' # The full version, including alpha/beta/rc tags. -release = '3.1.7-dev' +release = '3.1.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 34e654078..85f5ecf5f 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,7 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.7-dev (Current version) `_ +- `CodeIgniter v3.1.7 (Current version) `_ - `CodeIgniter v3.1.6 `_ - `CodeIgniter v3.1.5 `_ - `CodeIgniter v3.1.4 `_ -- cgit v1.2.3-24-g4f1b From 5a0f04e232c3f2c681b99ba6f0a8e383303ec296 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 13 Jan 2018 14:01:06 +0200 Subject: [ci skip] Start 3.1.8-dev --- user_guide_src/source/changelog.rst | 6 ++++++ user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 3 ++- user_guide_src/source/installation/upgrade_318.rst | 14 ++++++++++++++ user_guide_src/source/installation/upgrading.rst | 1 + 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 user_guide_src/source/installation/upgrade_318.rst (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index e23517a86..686f9b83e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,6 +2,12 @@ Change Log ########## +Version 3.1.8 +============= + +Release Date: Not Released + + Version 3.1.7 ============= diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index fbd81c47e..e03c3168f 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2018, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.7' +version = '3.1.8-dev' # The full version, including alpha/beta/rc tags. -release = '3.1.7' +release = '3.1.8-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 85f5ecf5f..03913159b 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,8 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.7 (Current version) `_ +- `CodeIgniter v3.1.8-dev (Current version) `_ +- `CodeIgniter v3.1.7 `_ - `CodeIgniter v3.1.6 `_ - `CodeIgniter v3.1.5 `_ - `CodeIgniter v3.1.4 `_ diff --git a/user_guide_src/source/installation/upgrade_318.rst b/user_guide_src/source/installation/upgrade_318.rst new file mode 100644 index 000000000..8b13f5c50 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_318.rst @@ -0,0 +1,14 @@ +############################# +Upgrading from 3.1.7 to 3.1.8 +############################# + +Before performing an update you should take your site offline by +replacing the index.php file with a static one. + +Step 1: Update your CodeIgniter files +===================================== + +Replace all files and directories in your *system/* directory. + +.. note:: If you have any custom developed files in these directories, + please make copies of them first. diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index 1cc249869..a51b128ec 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -8,6 +8,7 @@ upgrading from. .. toctree:: :titlesonly: + Upgrading from 3.1.7 to 3.1.8 Upgrading from 3.1.6 to 3.1.7 Upgrading from 3.1.5 to 3.1.6 Upgrading from 3.1.4 to 3.1.5 -- cgit v1.2.3-24-g4f1b From 221c09588be796ba352683cd7814af33501d4fa6 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 22 Jan 2018 10:29:19 +0200 Subject: Fix a bug where INTL_IDNA_VARIANT_UTS46 was used while undeclared The constant was introduced in PHP 5.4, and is documented that way, but it actually depends on PHP being linked to ICU 4.6+, while the minimum requirement for compilation is 4.0 ... When this happens on PHP 7.2, an E_DEPRECATED notice will be emitted; there's currently a discussion on php-internals to resolve that issue. --- user_guide_src/source/changelog.rst | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 686f9b83e..f74308342 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,12 @@ Version 3.1.8 Release Date: Not Released +- General Changes + +Bug fixes for 3.1.8 +------------------- + +- Fixed a bug where :doc:`Form Validation Library `, :doc:`Email Library ` tried to use ``INTL_IDNA_VARIANT_UTS46`` when it was undeclared. Version 3.1.7 ============= -- cgit v1.2.3-24-g4f1b From 329dd039a211ed7634b45e2c908f7dc375b806a2 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 22 Jan 2018 10:54:10 +0200 Subject: [ci skip] If possible, always negotiate for TLS 1.0, TLS 1.1, TLS 1.2 for SMTP connections in CI_Email --- user_guide_src/source/changelog.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index f74308342..f6e24e519 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,7 +7,9 @@ Version 3.1.8 Release Date: Not Released -- General Changes +- General Changes + + - Updated :doc:`Email Library ` to always negotiate between TLS 1.0, 1.1, 1.2 when possible (PHP 5.6+) for SMTP connections. Bug fixes for 3.1.8 ------------------- -- cgit v1.2.3-24-g4f1b From 7dd6f14073c109a3227d78e30780ab79117bda42 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 30 Jan 2018 15:08:21 +0200 Subject: Fix a QB bug where where(), having() treated values passed to them as arbitrary SQL --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index f6e24e519..9b7f0149c 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -15,6 +15,7 @@ Bug fixes for 3.1.8 ------------------- - Fixed a bug where :doc:`Form Validation Library `, :doc:`Email Library ` tried to use ``INTL_IDNA_VARIANT_UTS46`` when it was undeclared. +- Fixed a bug where :doc:`Query Builder ` methods ``where()``, ``having()`` treated values passed to them as arbitrary SQL. Version 3.1.7 ============= -- cgit v1.2.3-24-g4f1b From a911daa2775ee9d09404c91c8954c6a216568cb5 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 31 Jan 2018 23:58:39 +0200 Subject: [ci skip] Add changelog entry for PR #5391 --- user_guide_src/source/changelog.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 9b7f0149c..63de806f6 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,10 @@ Version 3.1.8 Release Date: Not Released +- **Security** + + - Updated :doc:`URL Helper ` function :php:func:`auto_link()` to add ``rel="noopener"`` to generated links in order to prevent tab hijacking. + - General Changes - Updated :doc:`Email Library ` to always negotiate between TLS 1.0, 1.1, 1.2 when possible (PHP 5.6+) for SMTP connections. -- cgit v1.2.3-24-g4f1b From 84760562d5bb875af0a33b0d0f636dc3081db7c0 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 12 Feb 2018 15:15:47 +0200 Subject: [ci skip] Fix rendering of literal 'http://' strings in the manual --- user_guide_src/source/changelog.rst | 4 ++-- user_guide_src/source/helpers/string_helper.rst | 4 ++-- user_guide_src/source/helpers/url_helper.rst | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 63de806f6..2b82d7b36 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -1938,7 +1938,7 @@ Hg Tag: v2.0.0 precision. - Added alpha, and sha1 string types to random_string() in the :doc:`String Helper `. - - Modified prep_url() so as to not prepend http:// if the supplied + - Modified prep_url() so as to not prepend \http:// if the supplied string already has a scheme. - Modified get_file_info in the file helper, changing filectime() to filemtime() for dates. @@ -2678,7 +2678,7 @@ Bugfixes for 1.6.2 instantiating new Language and Exception objects, and not using the error heading. - Fixed a bug (#4413) where a URI containing slashes only e.g. - 'http://example.com/index.php?//' would result in PHP errors + '\http://example.com/index.php?//' would result in PHP errors - Fixed an array to string conversion error in the Validation library (#4425) - Fixed bug (#4451, #4299, #4339) where failed transactions will not diff --git a/user_guide_src/source/helpers/string_helper.rst b/user_guide_src/source/helpers/string_helper.rst index a1fd7ee15..6dabc60d3 100644 --- a/user_guide_src/source/helpers/string_helper.rst +++ b/user_guide_src/source/helpers/string_helper.rst @@ -127,7 +127,7 @@ The following functions are available: :rtype: string Converts double slashes in a string to a single slash, except those - found in URL protocol prefixes (e.g. http://). + found in URL protocol prefixes (e.g. \http://). Example:: @@ -220,4 +220,4 @@ The following functions are available: Removes single and double quotes from a string. Example:: $string = "Joe's \"dinner\""; - $string = strip_quotes($string); //results in "Joes dinner" \ No newline at end of file + $string = strip_quotes($string); //results in "Joes dinner" diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst index 435a21df4..e117d37c0 100644 --- a/user_guide_src/source/helpers/url_helper.rst +++ b/user_guide_src/source/helpers/url_helper.rst @@ -144,7 +144,7 @@ The following functions are available: be a string or an array. .. note:: If you are building links that are internal to your application - do not include the base URL (http://...). This will be added + do not include the base URL (\http://...). This will be added automatically from the information specified in your config file. Include only the URI segments you wish appended to the URL. @@ -317,7 +317,7 @@ The following functions are available: :returns: Protocol-prefixed URL string :rtype: string - This function will add http:// in the event that a protocol prefix + This function will add \http:// in the event that a protocol prefix is missing from a URL. Pass the URL string to the function like this:: -- cgit v1.2.3-24-g4f1b From 2f1fc71c61ee9c781949d525f27fa1d5f11b9a95 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 28 Feb 2018 22:33:36 +0200 Subject: [ci skip] Fix 5423 --- user_guide_src/source/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 2b82d7b36..37291e196 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -14,12 +14,14 @@ Release Date: Not Released - General Changes - Updated :doc:`Email Library ` to always negotiate between TLS 1.0, 1.1, 1.2 when possible (PHP 5.6+) for SMTP connections. + - Updated :doc:`Database Library ` method ``version()`` to exclude suffixes to the main version numbers with the 'postgre' driver. Bug fixes for 3.1.8 ------------------- - Fixed a bug where :doc:`Form Validation Library `, :doc:`Email Library ` tried to use ``INTL_IDNA_VARIANT_UTS46`` when it was undeclared. - Fixed a bug where :doc:`Query Builder ` methods ``where()``, ``having()`` treated values passed to them as arbitrary SQL. +- Fixed a bug (#5423) - :doc:`Database Library ` method ``insert_id()`` failed due to incorrect server version parsing with the 'postgre' driver. Version 3.1.7 ============= -- cgit v1.2.3-24-g4f1b From 8ff2b1055e902ef4c66bbb6e3b1a4554872e6659 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 28 Feb 2018 22:44:09 +0200 Subject: [ci skip] Fix #5425 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 37291e196..95af9c086 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -22,6 +22,7 @@ Bug fixes for 3.1.8 - Fixed a bug where :doc:`Form Validation Library `, :doc:`Email Library ` tried to use ``INTL_IDNA_VARIANT_UTS46`` when it was undeclared. - Fixed a bug where :doc:`Query Builder ` methods ``where()``, ``having()`` treated values passed to them as arbitrary SQL. - Fixed a bug (#5423) - :doc:`Database Library ` method ``insert_id()`` failed due to incorrect server version parsing with the 'postgre' driver. +- Fixed a bug (#5425) - :doc:`XML-RPC Library ` produced an error message related to ``count()`` on PHP 7.2. Version 3.1.7 ============= -- cgit v1.2.3-24-g4f1b From dc1d71cea3ef0dc35fabdcebbaca6e333051aa40 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 10 Mar 2018 02:12:18 +0200 Subject: [ci skip] Add changelog entry for #5434 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 95af9c086..4eaed24ec 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -23,6 +23,7 @@ Bug fixes for 3.1.8 - Fixed a bug where :doc:`Query Builder ` methods ``where()``, ``having()`` treated values passed to them as arbitrary SQL. - Fixed a bug (#5423) - :doc:`Database Library ` method ``insert_id()`` failed due to incorrect server version parsing with the 'postgre' driver. - Fixed a bug (#5425) - :doc:`XML-RPC Library ` produced an error message related to ``count()`` on PHP 7.2. +- Fixed a bug (#5434) - :doc:`Image Manipulation Library ` attempted to ``chmod()`` while rendering images with the ``dynamic_output`` option. Version 3.1.7 ============= -- cgit v1.2.3-24-g4f1b From 3d204b63df199c7fb41d2602867ac3835776f40a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 10 Mar 2018 02:40:22 +0200 Subject: [ci skip] Fix #5420 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 4eaed24ec..37cd31d72 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -10,6 +10,7 @@ Release Date: Not Released - **Security** - Updated :doc:`URL Helper ` function :php:func:`auto_link()` to add ``rel="noopener"`` to generated links in order to prevent tab hijacking. + - Updated :doc:`Security Library ` method ``xss_clean()`` to also filter JavaScript tag functions. - General Changes -- cgit v1.2.3-24-g4f1b From 6efd42ebafceda967d1d8def06ee412d3c1f382b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 15 Mar 2018 16:24:42 +0200 Subject: [ci skip] Fix #5435 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 37cd31d72..21f5aae44 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -25,6 +25,7 @@ Bug fixes for 3.1.8 - Fixed a bug (#5423) - :doc:`Database Library ` method ``insert_id()`` failed due to incorrect server version parsing with the 'postgre' driver. - Fixed a bug (#5425) - :doc:`XML-RPC Library ` produced an error message related to ``count()`` on PHP 7.2. - Fixed a bug (#5434) - :doc:`Image Manipulation Library ` attempted to ``chmod()`` while rendering images with the ``dynamic_output`` option. +- Fixed a bug (#5435) - :doc:`Database Results ` method ``field_data()`` hid info about one field if ``limit()`` was previously used with the 'oci8' driver. Version 3.1.7 ============= -- cgit v1.2.3-24-g4f1b From bcce0a17f72c9550491a35e35555294943ff7fc1 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 15 Mar 2018 16:48:51 +0200 Subject: [ci skip] Add a changelog entry for PR #5431 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 21f5aae44..647ea93a1 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -11,6 +11,7 @@ Release Date: Not Released - Updated :doc:`URL Helper ` function :php:func:`auto_link()` to add ``rel="noopener"`` to generated links in order to prevent tab hijacking. - Updated :doc:`Security Library ` method ``xss_clean()`` to also filter JavaScript tag functions. + - Fixed a bug where :doc:`Security Library ` method ``xss_clean()`` didn't check for parentheses around JavaScript's ``document``. - General Changes -- cgit v1.2.3-24-g4f1b From cdf3a9a54fb240bc17fc681b02bd6327ac15d7d0 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 15 Mar 2018 16:58:31 +0200 Subject: [ci skip] Merge pull request #5437 from MadGuyyy/develop Docs spelling fix: utlize -> utilize --- user_guide_src/source/database/query_builder.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 1b79c893a..38bc7fcff 100644 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -654,7 +654,7 @@ will be reset (by default it will be--just like $this->db->insert()):: // Produces string: INSERT INTO mytable (`title`, `content`) VALUES ('My Title', 'My Content') The key thing to notice in the above example is that the second query did not -utlize `$this->db->from()` nor did it pass a table name into the first +utilize `$this->db->from()` nor did it pass a table name into the first parameter. The reason this worked is because the query has not been executed using `$this->db->insert()` which resets values or reset directly using `$this->db->reset_query()`. -- cgit v1.2.3-24-g4f1b From b12fbad77bd69ca0c7624a9094c29b7691ea6107 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 22 Mar 2018 16:44:41 +0200 Subject: [ci skip] Prepare 3.1.8 release --- user_guide_src/source/changelog.rst | 2 +- user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 647ea93a1..371b49529 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -5,7 +5,7 @@ Change Log Version 3.1.8 ============= -Release Date: Not Released +Release Date: Mar 22, 2018 - **Security** diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index e03c3168f..553669996 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2018, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.8-dev' +version = '3.1.8' # The full version, including alpha/beta/rc tags. -release = '3.1.8-dev' +release = '3.1.8' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 03913159b..27675a13c 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,7 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.8-dev (Current version) `_ +- `CodeIgniter v3.1.8 (Current version) `_ - `CodeIgniter v3.1.7 `_ - `CodeIgniter v3.1.6 `_ - `CodeIgniter v3.1.5 `_ -- cgit v1.2.3-24-g4f1b From 3d2073e877cb1fddbea8fcec5bc5d38b545cdcfa Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 22 Mar 2018 16:52:42 +0200 Subject: [ci skip] Mark the start of 3.1.9 development --- user_guide_src/source/changelog.rst | 6 ++++++ user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 3 ++- user_guide_src/source/installation/upgrade_319.rst | 14 ++++++++++++++ user_guide_src/source/installation/upgrading.rst | 1 + 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 user_guide_src/source/installation/upgrade_319.rst (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 371b49529..d0989da48 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,6 +2,12 @@ Change Log ########## +Version 3.1.9 +============= + +Release Date: Not Released + + Version 3.1.8 ============= diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 553669996..7e1e52035 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2018, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.8' +version = '3.1.9-dev' # The full version, including alpha/beta/rc tags. -release = '3.1.8' +release = '3.1.9-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 27675a13c..6147f4dfd 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,8 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.8 (Current version) `_ +- `CodeIgniter v3.1.9-dev (Current version) `_ +- `CodeIgniter v3.1.8 `_ - `CodeIgniter v3.1.7 `_ - `CodeIgniter v3.1.6 `_ - `CodeIgniter v3.1.5 `_ diff --git a/user_guide_src/source/installation/upgrade_319.rst b/user_guide_src/source/installation/upgrade_319.rst new file mode 100644 index 000000000..99a7347a0 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_319.rst @@ -0,0 +1,14 @@ +############################# +Upgrading from 3.1.8 to 3.1.9 +############################# + +Before performing an update you should take your site offline by +replacing the index.php file with a static one. + +Step 1: Update your CodeIgniter files +===================================== + +Replace all files and directories in your *system/* directory. + +.. note:: If you have any custom developed files in these directories, + please make copies of them first. diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index a51b128ec..95525a7c6 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -8,6 +8,7 @@ upgrading from. .. toctree:: :titlesonly: + Upgrading from 3.1.8 to 3.1.9 Upgrading from 3.1.7 to 3.1.8 Upgrading from 3.1.6 to 3.1.7 Upgrading from 3.1.5 to 3.1.6 -- cgit v1.2.3-24-g4f1b From 11c25e1dc3995ab7707f9435315c12c31ad6cf3e Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 26 Mar 2018 20:16:15 +0300 Subject: [ci skip] Alter CI_Upload documentation on client_name (#5446) --- user_guide_src/source/libraries/file_uploading.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/libraries/file_uploading.rst b/user_guide_src/source/libraries/file_uploading.rst index 6d2106be8..babdc04f9 100644 --- a/user_guide_src/source/libraries/file_uploading.rst +++ b/user_guide_src/source/libraries/file_uploading.rst @@ -344,7 +344,7 @@ Class Reference full_path Absolute server path, including the file name raw_name File name, without the extension orig_name Original file name. This is only useful if you use the encrypted name option. - client_name File name as supplied by the client user agent, prior to any file name preparation or incrementing + client_name File name supplied by the client user agent, but possibly sanitized file_ext Filename extension, period included file_size File size in kilobytes is_image Whether the file is an image or not. 1 = image. 0 = not. -- cgit v1.2.3-24-g4f1b From 68b0e088a25dee720642f42d76ea395c209be855 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 13 Apr 2018 13:08:52 +0300 Subject: Fix #5448 --- user_guide_src/source/changelog.rst | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index d0989da48..7f2a8355f 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -8,6 +8,11 @@ Version 3.1.9 Release Date: Not Released +Bug fixes for 3.1.9 +------------------- + +- Fixed a regression (#5448) - :doc:`Query Builder ` methods ``like()``, ``or_like()`` (and siblings) didn't apply *dbprefix* or identifier escaping. + Version 3.1.8 ============= -- cgit v1.2.3-24-g4f1b From d85c048f076246dc30f1d8ee0270c6b95ee25ba5 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 14 Apr 2018 16:50:02 +0300 Subject: [ci skip] Add changelog entry for #5462 (PR #5464) --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 7f2a8355f..a6c432054 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -12,6 +12,7 @@ Bug fixes for 3.1.9 ------------------- - Fixed a regression (#5448) - :doc:`Query Builder ` methods ``like()``, ``or_like()`` (and siblings) didn't apply *dbprefix* or identifier escaping. +- Fixed a regression (#5462) - :doc:`Query Builder ` methods ``like()``, ``or_like()`` (and siblings) produced incorrect SQL syntax when used with ``'before'`` as the third parameter. Version 3.1.8 ============= -- cgit v1.2.3-24-g4f1b From 13265c5aabe5e3fd462a9f89031952b346efee73 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 23 Apr 2018 14:29:02 +0300 Subject: [ci skip] Add changelog entry for PR #5471 --- user_guide_src/source/changelog.rst | 3 +++ 1 file changed, 3 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index a6c432054..36f655182 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,9 @@ Version 3.1.9 Release Date: Not Released +- General Changes + + - Updated :doc:`Query Builder ` method ``limit()`` to allow ``0`` values. Bug fixes for 3.1.9 ------------------- -- cgit v1.2.3-24-g4f1b From 0a715d6df5d6d9de8da861dccd1dd5f16e738efc Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 23 Apr 2018 14:33:45 +0300 Subject: [ci skip] Move changelog entry for PR #5391 from 3.1.8 to 3.1.9 Apparently I forgot to cherry-pick the actual change into 3.1-stable --- user_guide_src/source/changelog.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 36f655182..d2033ac39 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,10 @@ Version 3.1.9 Release Date: Not Released +- **Security** + + - Updated :doc:`URL Helper ` function :php:func:`auto_link()` to add ``rel="noopener"`` to generated links in order to prevent tab hijacking. + - General Changes - Updated :doc:`Query Builder ` method ``limit()`` to allow ``0`` values. @@ -24,7 +28,6 @@ Release Date: Mar 22, 2018 - **Security** - - Updated :doc:`URL Helper ` function :php:func:`auto_link()` to add ``rel="noopener"`` to generated links in order to prevent tab hijacking. - Updated :doc:`Security Library ` method ``xss_clean()`` to also filter JavaScript tag functions. - Fixed a bug where :doc:`Security Library ` method ``xss_clean()`` didn't check for parentheses around JavaScript's ``document``. -- cgit v1.2.3-24-g4f1b From d248db4e71c97da0d03d717601fef3c58efebad6 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 1 Jun 2018 17:51:29 +0300 Subject: [ci skip] Add changelog entry for #5516 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index d2033ac39..f03794e78 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -20,6 +20,7 @@ Bug fixes for 3.1.9 - Fixed a regression (#5448) - :doc:`Query Builder ` methods ``like()``, ``or_like()`` (and siblings) didn't apply *dbprefix* or identifier escaping. - Fixed a regression (#5462) - :doc:`Query Builder ` methods ``like()``, ``or_like()`` (and siblings) produced incorrect SQL syntax when used with ``'before'`` as the third parameter. +- Fixed a bug (#5516) - :doc:`HTML Helper ` functions :php:func:`img()`, :php:func:`link_tag()` would output results with double slashes if a prefix slash was included in their path inputs. Version 3.1.8 ============= -- cgit v1.2.3-24-g4f1b From 6ec8737d96312be99f1e3b6dffaab584cc6204d4 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 4 Jun 2018 17:04:51 +0300 Subject: [ci skip] Update upgrade instructions for PR #5512 --- user_guide_src/source/installation/upgrade_319.rst | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/installation/upgrade_319.rst b/user_guide_src/source/installation/upgrade_319.rst index 99a7347a0..3b8da3367 100644 --- a/user_guide_src/source/installation/upgrade_319.rst +++ b/user_guide_src/source/installation/upgrade_319.rst @@ -12,3 +12,10 @@ Replace all files and directories in your *system/* directory. .. note:: If you have any custom developed files in these directories, please make copies of them first. + +******************************** +Step 3: Replace config/mimes.php +******************************** + +This config file has received some updates. Please copy it to +*application/config/mimes.php*. -- cgit v1.2.3-24-g4f1b From 4d3fea4a628e7a9bc03192fb1a6e2e971f3f9d46 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 12 Jun 2018 16:37:02 +0300 Subject: [ci skip] Add a changelog entry for PR #5510 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index f03794e78..007e01cd8 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -14,6 +14,7 @@ Release Date: Not Released - General Changes - Updated :doc:`Query Builder ` method ``limit()`` to allow ``0`` values. + - Updated :doc:`Email Library ` and :doc:`Form Validation Library ` to discard the results of failed ``idn_to_ascii()`` calls while validating e-mail addresses. Bug fixes for 3.1.9 ------------------- -- cgit v1.2.3-24-g4f1b From a9da3dd2f16a8f97d7bc4ff5572b28e4bb84c813 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 12 Jun 2018 16:40:12 +0300 Subject: [ci skip] Prepare 3.1.9 release --- user_guide_src/source/changelog.rst | 3 ++- user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 007e01cd8..512480969 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -5,11 +5,12 @@ Change Log Version 3.1.9 ============= -Release Date: Not Released +Release Date: Jun 12, 2018 - **Security** - Updated :doc:`URL Helper ` function :php:func:`auto_link()` to add ``rel="noopener"`` to generated links in order to prevent tab hijacking. + - Fixed a possible session fixation vulnerability where the :doc:`Session Library ` enabled ``session.use_strict_mode`` but it didn't actually do anything (thanks to Aamer Shah, Prasanna Kumar). - General Changes diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 7e1e52035..e396217de 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2018, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.9-dev' +version = '3.1.9' # The full version, including alpha/beta/rc tags. -release = '3.1.9-dev' +release = '3.1.9' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 6147f4dfd..e2c764c82 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,7 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.9-dev (Current version) `_ +- `CodeIgniter v3.1.9 (Current version) `_ - `CodeIgniter v3.1.8 `_ - `CodeIgniter v3.1.7 `_ - `CodeIgniter v3.1.6 `_ -- cgit v1.2.3-24-g4f1b