From 9ff523345c8baf16915e940f5a85e8d42978a98d Mon Sep 17 00:00:00 2001
From: Lucas D Hedding <lucashedding@1463982.no-reply.drupal.org>
Date: Tue, 28 May 2013 16:00:22 -0500
Subject: [PATCH] Issue #2002346 by crowdcg, marlatt, farfanfelipe | heddn:
 Rename Views method adjust_join() to adjustJoin().

---
 .../lib/Drupal/views/Plugin/views/join/JoinPluginBase.php  |    2 +-
 .../views/lib/Drupal/views/Plugin/views/query/Sql.php      |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
index c258f3e..8b8b04f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
@@ -134,7 +134,7 @@ class JoinPluginBase extends ContainerFactoryPluginBase {
    * @var bool
    *
    * @see Drupal\views\Plugin\HandlerBase::getTableJoin()
-   * @see Drupal\views\Plugin\views\query\Sql::adjust_join()
+   * @see Drupal\views\Plugin\views\query\Sql::adjustJoin()
    * @see Drupal\views\Plugin\views\relationship\RelationshipPluginBase::query()
    */
   public $adjusted;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
index 708cdb2..d89e99b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
@@ -307,7 +307,7 @@ function add_relationship($alias, JoinPluginBase $join, $base, $link_point = NUL
 
     // Make sure this join is adjusted for our relationship.
     if ($link_point && isset($this->relationships[$link_point])) {
-      $join = $this->adjust_join($join, $link_point);
+      $join = $this->adjustJoin($join, $link_point);
     }
 
     // Add the table directly to the queue to avoid accidentally marking
@@ -370,7 +370,7 @@ function add_table($table, $relationship = NULL, JoinPluginBase $join = NULL, $a
     }
 
     if ($join && $relationship) {
-      $join = $this->adjust_join($join, $relationship);
+      $join = $this->adjustJoin($join, $relationship);
     }
 
     return $this->queue_table($table, $relationship, $join, $alias);
@@ -452,7 +452,7 @@ function queue_table($table, $relationship = NULL, JoinPluginBase $join = NULL,
         return FALSE;
       }
 
-      $join = $this->adjust_join($join, $relationship);
+      $join = $this->adjustJoin($join, $relationship);
     }
 
     $this->table_queue[$alias] = array(
@@ -543,7 +543,7 @@ function ensure_table($table, $relationship = NULL, JoinPluginBase $join = NULL)
     // Adjust this join for the relationship, which will ensure that the 'base'
     // table it links to is correct. Tables adjoined to a relationship
     // join to a link point, not the base table.
-    $join = $this->adjust_join($join, $relationship);
+    $join = $this->adjustJoin($join, $relationship);
 
     if ($this->ensure_path($table, $relationship, $join)) {
       // Attempt to eliminate redundant joins.  If this table's
@@ -613,7 +613,7 @@ function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array
 
       // Make sure that we're linking to the correct table for our relationship.
       foreach (array_reverse($add) as $table => $path_join) {
-        $this->queue_table($table, $relationship, $this->adjust_join($path_join, $relationship));
+        $this->queue_table($table, $relationship, $this->adjustJoin($path_join, $relationship));
       }
       return TRUE;
     }
@@ -639,7 +639,7 @@ function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array
    * Fix a join to adhere to the proper relationship; the left table can vary
    * based upon what relationship items are joined in on.
    */
-  function adjust_join($join, $relationship) {
+  protected function adjustJoin($join, $relationship) {
     if (!empty($join->adjusted)) {
       return $join;
     }
-- 
1.7.10.4