summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-07-26 22:12:16 +0200
committerAndrey Andreev <narf@devilix.net>2015-07-26 22:12:16 +0200
commitd91ed26ebb47bebb86a2021d7f2b57488be72abb (patch)
tree2cf320f4c6118e4de8484cfc0897d8fb254d1985
parent5ea646a9a1012168fde1a6a2b970d4168e2c11fc (diff)
Fix #4000
-rw-r--r--system/libraries/Pagination.php3
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 3 insertions, 1 deletions
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 76437f4a5..5b3aa01f4 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -353,7 +353,8 @@ class CI_Pagination {
*/
public function initialize(array $params = array())
{
- if (isset($params['attributes']) && is_array($params['attributes']))
+ isset($params['attributes']) OR $params['attributes'] = array();
+ if (is_array($params['attributes']))
{
$this->_parse_attributes($params['attributes']);
unset($params['attributes']);
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ee52d2e49..fac119f78 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -72,6 +72,7 @@ Bug fixes for 3.0.1
- Fixed a bug (#3279) - :doc:`Query Builder <database/query_builder>` methods ``update()`` and ``get_compiled_update()`` did double escaping on the table name if it was provided via ``from()``.
- Fixed a bug (#3991) - ``$config['rewrite_short_tags']`` never worked due to ``function_exists('eval')`` always returning FALSE.
- Fixed a bug where the :doc:`File Uploadin Library <libraries/file_uploading>` library will not properly configure its maximum file size unless the input value is of type integer.
+- Fixed a bug (#4000) - :doc:`Pagination Library <libraries/pagination>` didn't enable "rel" attributes by default if no attributes-related config options were used.
Version 3.0.0
=============