From 331e80a02c7c2de92abc32546c30e6be6044b606 Mon Sep 17 00:00:00 2001
From: Lucas D Hedding <lucashedding@1463982.no-reply.drupal.org>
Date: Tue, 11 Jun 2013 07:57:27 -0500
Subject: [PATCH] Issue #2003436 by Dan Reinders: Rename Views method
 page_display_options() to pageDisplayOptions().

---
 .../comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php |    6 +++---
 core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php |    8 ++++----
 .../lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php  |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php
index d3c7759..f48b917 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php
@@ -100,10 +100,10 @@ protected function buildFormStyle(array &$form, array &$form_state, $type) {
   }
 
   /**
-   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::page_display_options().
+   * {@inheritdoc}
    */
-  protected function page_display_options(array $form, array &$form_state) {
-    $display_options = parent::page_display_options($form, $form_state);
+  protected function pageDisplayOptions(array $form, array &$form_state) {
+    $display_options = parent::pageDisplayOptions($form, $form_state);
     $row_plugin = isset($form_state['values']['page']['style']['row_plugin']) ? $form_state['values']['page']['style']['row_plugin'] : NULL;
     $row_options = isset($form_state['values']['page']['style']['row_options']) ? $form_state['values']['page']['style']['row_options'] : array();
     $this->display_options_row($display_options, $row_plugin, $row_options);
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
index 568f757..db8b858 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
@@ -192,10 +192,10 @@ protected function defaultDisplayFiltersUser(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::page_display_options().
+   * {@inheritdoc}
    */
-  protected function page_display_options(array $form, array &$form_state) {
-    $display_options = parent::page_display_options($form, $form_state);
+  protected function pageDisplayOptions(array $form, array &$form_state) {
+    $display_options = parent::pageDisplayOptions($form, $form_state);
     $row_plugin = isset($form_state['values']['page']['style']['row_plugin']) ? $form_state['values']['page']['style']['row_plugin'] : NULL;
     $row_options = isset($form_state['values']['page']['style']['row_options']) ? $form_state['values']['page']['style']['row_options'] : array();
     $this->display_options_row($display_options, $row_plugin, $row_options);
@@ -203,7 +203,7 @@ protected function page_display_options(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::page_display_options().
+   * {@inheritdoc}
    */
   protected function blockDisplayOptions(array $form, array &$form_state) {
     $display_options = parent::blockDisplayOptions($form, $form_state);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index bb8af77..349b6ae 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -661,7 +661,7 @@ protected function buildDisplayOptions($form, $form_state) {
 
     // Display: Page
     if (!empty($form_state['values']['page']['create'])) {
-      $display_options['page'] = $this->page_display_options($form, $form_state);
+      $display_options['page'] = $this->pageDisplayOptions($form, $form_state);
 
       // Display: Feed (attached to the page)
       if (!empty($form_state['values']['page']['feed'])) {
@@ -954,7 +954,7 @@ protected function defaultDisplaySortsUser($form, $form_state) {
    * @return array
    *   Returns an array of display options.
    */
-  protected function page_display_options(array $form, array &$form_state) {
+  protected function pageDisplayOptions(array $form, array &$form_state) {
     $display_options = array();
     $page = $form_state['values']['page'];
     $display_options['title'] = $page['title'];
-- 
1.7.10.4