diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-04-29 00:01:28 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-04-29 00:01:28 +0200 |
| commit | e0839c3f2aba473f5cb7e81d30ebbb4e0d4d16a5 (patch) | |
| tree | 156da1efb6508cbcf72e346cd7e95c77d07bb3b3 | |
| parent | fd6efad5ac8bd5e7d08266ec407016221cd9ce99 (diff) | |
| parent | 15f1e247193617d351868bdc9c280f64334f0d7f (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
| -rw-r--r-- | system/core/Exceptions.php | 2 | ||||
| -rw-r--r-- | system/core/Output.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 5bcb7c1c5..cb4bc3cd6 100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -45,7 +45,7 @@ class CI_Exceptions { public $ob_level; /** - * List if available error levels + * List of available error levels * * @var array */ diff --git a/system/core/Output.php b/system/core/Output.php index df9ef0778..238d223e2 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -243,7 +243,7 @@ class CI_Output { } $header = 'Content-Type: '.$mime_type - .(empty($charset) ? NULL : '; charset='.$charset); + .(empty($charset) ? '' : '; charset='.$charset); $this->headers[] = array($header, TRUE); return $this; diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php index 7758a8578..9b0725ea6 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 125197434..edf0a497b 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -278,7 +278,7 @@ Release Date: Not Released - Library changed to :doc:`Driver <general/drivers>` with classic 'cookie' driver as the default. - Added a 'native' PHP Session driver to work with ``$_SESSION``. - - Added a new **tempdata** feature that allows setting userdata items with expiration time (``tempdata()``, ``set_tempdata()``, ``unset_tempdata()``). + - Added a new **tempdata** feature that allows setting userdata items with expiration time (``tempdata()``, ``set_tempdata()``, ``unset_tempdata()``). - Added default ``$config['sess_driver']`` and ``$config['sess_valid_drivers']`` items to *application/config.php* file. - Changed 'cookie' driver to respect php.ini's *session.gc_probability* and *session.gc_divisor* settings. - Changed 'cookie' driver to use HMAC authentication instead of a simple md5 checksum. @@ -507,7 +507,7 @@ Release Date: Not Released - :doc:`Language Library <libraries/language>` changes include: - Changed method ``load()`` to filter the language name with ``ctype_alpha()``. - - Added an optional second parameter to method ``line()`` to disable error login for line keys that were not found. + - Added an optional second parameter to method ``line()`` to disable error logging for line keys that were not found. - Language files are now loaded in a cascading style with the one in **system/** always loaded and overriden afterwards, if another one is found. - :doc:`Hooks Library <general/hooks>` changes include: |