Fixes #4320 updated documentation for base_url in pagination and added backward compa...

diff --git a/mod/search/views/default/search/list.php b/mod/search/views/default/search/list.php
index c5249fe77e1fc61d49d2d265a6f900d88112d875..1ed40be1b8c091f3a3f59784401a1692fe99e300 100644 (file)
--- a/mod/search/views/default/search/list.php
+++ b/mod/search/views/default/search/list.php
@@ -39,7 +39,7 @@ $url = elgg_get_site_url() . "search?$query";
 // get pagination
 if (array_key_exists('pagination', $vars['params']) && $vars['params']['pagination']) {
        $nav = elgg_view('navigation/pagination',array(
-               'baseurl' => $url,
+               'base_url' => $url,
                'offset' => $vars['params']['offset'],
                'count' => $vars['results']['count'],
                'limit' => $vars['params']['limit'],

diff --git a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
index 2afd6022d7b63579b465d2b26cdfb60d1045972f..cbd13a709613f9ac0a20de0273b11c5c1cf5c3be 100644 (file)
--- a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
+++ b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
@@ -40,7 +40,7 @@ elgg_set_ignore_access($ia);
 
 // setup pagination
 $pagination = elgg_view('navigation/pagination',array(
-       'baseurl' => 'admin/users/unvalidated',
+       'base_url' => 'admin/users/unvalidated',
        'offset' => $offset,
        'count' => $count,
        'limit' => $limit,

diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index ad4689d83ae5aa9dc514c3579c4a73477ad02531..e0d35532774006c51d1c5503a9a0bf5e19421474 100644 (file)
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -8,7 +8,7 @@
  * @uses int    $vars['offset']     The offset in the list
  * @uses int    $vars['limit']      Number of items per page
  * @uses int    $vars['count']      Number of items in list
- * @uses string $vars['baseurl']    Base URL to use in links
+ * @uses string $vars['base_url']   Base URL to use in links
  * @uses string $vars['offset_key'] The string to use for offet in the URL
  */
 
@@ -28,6 +28,9 @@ $offset_key = elgg_extract('offset_key', $vars, 'offset');
 // some views pass an empty string for base_url
 if (isset($vars['base_url']) && $vars['base_url']) {
        $base_url = $vars['base_url'];
+} else if (isset($vars['baseurl']) && $vars['baseurl']) {
+       elgg_deprecated_notice("Use 'base_url' instead of 'baseurl' for the navigation/pagination view", 1.8);
+       $base_url = $vars['baseurl'];
 } else {
        $base_url = current_page_url();
 }

diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index c0db50bc522c06e0ca7ba6daf0600558e265b956..28c907ab6cf0eef8f3c09c4e0b51d58992a578f2 100644 (file)
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -40,7 +40,7 @@ $nav = "";
 
 if ($pagination && $count) {
        $nav .= elgg_view('navigation/pagination', array(
-               'baseurl' => $base_url,
+               'base_url' => $base_url,
                'offset' => $offset,
                'count' => $count,
                'limit' => $limit,