diff options
author | Eric Barnes <eric@ericlbarnes.com> | 2011-09-21 17:37:54 +0200 |
---|---|---|
committer | Eric Barnes <eric@ericlbarnes.com> | 2011-09-21 17:37:54 +0200 |
commit | 246cd1795755e08e1cdf78a0fb42c05af6c30461 (patch) | |
tree | b57bd02e5cd9567304c5abceb28e095164d0578c /user_guide | |
parent | a4fac6b8ac17b6864e632fe821b650291a9d4c42 (diff) | |
parent | 44e6182d2e50aef657511660b96486a2c8f8d78d (diff) |
Merge branch 'develop' of https://github.com/akuzemchak/CodeIgniter into akuzemchak-develop
Conflicts:
user_guide/changelog.html
Diffstat (limited to 'user_guide')
-rw-r--r-- | user_guide/changelog.html | 1 | ||||
-rw-r--r-- | user_guide/libraries/pagination.html | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8a4a70642..b9c1b6094 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -103,6 +103,7 @@ Change Log <li><samp>CI_Loader::_ci_autoloader()</samp> is now a protected method.</li> <li>Added <kbd>is_unique</kbd> to the <a href="libraries/form_validation.html">Form Validation library</a>.</li> <li>Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the <a href="libraries/form_validation.html">Form Validation</a> library.</li> + <li>Added <kbd>$config['use_page_numbers']</kbd> to the <a href="libraries/pagination.html">Pagination library</a>, which enables real page numbers in the URI.</li> </ul> </li> <li>Core diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 196555441..6a144114d 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -119,7 +119,11 @@ something different you can specify it.</p> <p>The number of "digit" links you would like before and after the selected page number. For example, the number 2 will place two digits on either side, as in the example links at the very top of this page.</p> -<h4>$config['page_query_string'] = TRUE</h4> + +<h4>$config['use_page_numbers'] = TRUE;</h4> +<p>By default, the URI segment will use the starting index for the items you are paginating. If you prefer to show the the actual page number, set this to TRUE.</p> + +<h4>$config['page_query_string'] = TRUE;</h4> <p>By default, the pagination library assume you are using <a href="../general/urls.html">URI Segments</a>, and constructs your links something like</p> <p><code>http://example.com/index.php/test/page/20</code></p> <p>If you have $config['enable_query_strings'] set to TRUE your links will automatically be re-written using Query Strings. This option can also be explictly set. Using $config['page_query_string'] set to TRUE, the pagination link will become.</p> |