commit 060d3634453b0e0a745c45f654d8cfb3e299ed23
Author: Ivan Boothe <ivan@rootwork.org>
Date:   Fri May 24 16:52:49 2013 -0700

    2002898-new-changes

diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
index b362bb3..822a002 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
@@ -50,7 +50,7 @@ public function get_value($values, $field = NULL) {
     $pager = $this->view->pager;
     // Get the base count of the pager.
     if ($pager->use_pager()) {
-      $count += ($pager->get_items_per_page() * $pager->get_current_page() + $pager->set_offset());
+      $count += ($pager->get_items_per_page() * $pager->getCurrentPage() + $pager->set_offset());
     }
     // Add the counter for the current site.
     $count += $this->view->row_index + 1;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php
index 3e19f26..ba5fb40 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php
@@ -57,7 +57,7 @@ public function query() {
 
     // Don't query for the next page if we have a pager that has a limited
     // amount of pages.
-    if (empty($this->options['total_pages']) || ($this->get_current_page() < $this->options['total_pages'])) {
+    if (empty($this->options['total_pages']) || ($this->getCurrentPage() < $this->options['total_pages'])) {
       // Increase the items in the query in order to be able to find out whether
       // there is another page.
       $limit = $this->view->query->getLimit();
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
index 49ef067..a7196a6 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
@@ -103,7 +103,7 @@ function set_offset($offset) {
    *
    * If NULL, we do not know what the current page is.
    */
-  function get_current_page() {
+  public function getCurrentPage() {
     return $this->current_page;
   }
 
@@ -114,7 +114,7 @@ function get_current_page() {
    *   If provided, the page number will be set to this. If NOT provided,
    *   the page number will be set from the global page array.
    */
-  function set_current_page($number = NULL) {
+  public function setCurrentPage($number = NULL) {
     if (!is_numeric($number) || $number < 0) {
       $number = 0;
     }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php
index f7eb34b..4133201 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php
@@ -249,7 +249,7 @@ public function query() {
    *   If provided, the page number will be set to this. If NOT provided,
    *   the page number will be set from the global page array.
    */
-  function set_current_page($number = NULL) {
+  public function setCurrentPage($number = NULL) {
     if (isset($number)) {
       $this->current_page = max(0, $number);
       return;
@@ -314,7 +314,7 @@ function update_page_info() {
       // See if the requested page was within range:
       if ($this->current_page >= $pager_total[$this->options['id']]) {
         // Pages are numbered from 0 so if there are 10 pages, the last page is 9.
-        $this->set_current_page($pager_total[$this->options['id']] - 1);
+        $this->setCurrentPage($pager_total[$this->options['id']] - 1);
       }
 
       // Put this number in to guarantee that we do not generate notices when the pager
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php
index 13d30ef..f542eb5 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php
@@ -284,7 +284,7 @@ function testPagerApi() {
     $this->assertEqual($view->getCurrentPage(), NULL, 'If the pager is not initialized and no manual override there is no current page.');
     $rand_number = rand(1, 5);
     $view->setCurrentPage($rand_number);
-    $this->assertEqual($view->getCurrentPage(), $rand_number, 'Make sure get_current_page uses the settings of set_current_page.');
+    $this->assertEqual($view->getCurrentPage(), $rand_number, 'Make sure getCurrentPage uses the settings of setCurrentPage.');
 
     $view->destroy();
 
@@ -311,8 +311,8 @@ function testPagerApi() {
     $rand_number = rand(1, 5);
     $view->setCurrentPage($rand_number);
     $rand_number = rand(6, 11);
-    $view->pager->set_current_page($rand_number);
-    $this->assertEqual($view->getCurrentPage(), $rand_number, 'Make sure get_current_page uses the settings of set_current_page.');
+    $view->pager->setCurrentPage($rand_number);
+    $this->assertEqual($view->getCurrentPage(), $rand_number, 'Make sure setCurrentPage uses the settings of setCurrentPage.');
 
     // Set an invalid page and make sure the method takes care about it.
     $view->setCurrentPage(-1);
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index a8a8dd2..52cae9d 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -468,7 +468,7 @@ public function setCurrentPage($page) {
 
     // If the pager is already initialized, pass it through to the pager.
     if (!empty($this->pager)) {
-      return $this->pager->set_current_page($page);
+      return $this->pager->setCurrentPage($page);
     }
   }
 
@@ -478,7 +478,7 @@ public function setCurrentPage($page) {
   public function getCurrentPage() {
     // If the pager is already initialized, pass it through to the pager.
     if (!empty($this->pager)) {
-      return $this->pager->get_current_page();
+      return $this->pager->getCurrentPage();
     }
 
     if (isset($this->current_page)) {
@@ -753,7 +753,7 @@ public function initPager() {
       $this->pager = $this->display_handler->getPlugin('pager');
 
       if ($this->pager->use_pager()) {
-        $this->pager->set_current_page($this->current_page);
+        $this->pager->setCurrentPage($this->current_page);
       }
 
       // These overrides may have been set earlier via $view->set_*