569 $ git pull --rebase Current branch 8.x is up to date. [~/foo/d8-git] 01:34 AM [YesCT] (8.x) 570 $ git reset --hard HEAD is now at 7061f3b - Issue #1739986 by pwolanin, sun, moshe weitzman: Fixed fallback in drupal_get_hash_salt(), move it to bootstrap.inc, use instead of ['drupal_hash_salt()']. [~/foo/d8-git] 01:34 AM [YesCT] (8.x) 571 $ drush am 1844276 You are not working in a site, and the current directory is not named[error] after the project. Please cd to the project views and try again. [~/foo/d8-git] 01:34 AM [YesCT] (8.x) 572 $ curl -O http://drupal.org/files/views-spelling-mistake-1844276-14.patch % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 1295 100 1295 0 0 4594 0 --:--:-- --:--:-- --:--:-- 6641 [~/foo/d8-git] 01:34 AM [YesCT] (8.x) 573 $ git checkout -b spelling-15 Switched to a new branch 'spelling-15' [~/foo/d8-git] 01:34 AM [YesCT] (spelling-15) 574 $ git apply --index views-spelling-mistake-1844276-14.patch error: lib/Drupal/views/Plugin/views/filter/Combine.php: does not exist in index [~/foo/d8-git] 01:34 AM [YesCT] (spelling-15) 575 $ cd core/modules/views [~/foo/d8-git/core/modules/views] 01:35 AM [YesCT] (spelling-15) 576 $ !git git apply --index views-spelling-mistake-1844276-14.patch fatal: can't open patch 'core/modules/views/views-spelling-mistake-1844276-14.patch': No such file or directory [~/foo/d8-git/core/modules/views] 01:35 AM [YesCT] (spelling-15) 577 $ git apply --index views-spelling-mistake-1844276-14.patch [~/foo/d8-git/core/modules/views] 01:35 AM [YesCT] (spelling-15) 577 $ git apply --index ../../../views-spelling-mistake-1844276-14.patch [~/foo/d8-git/core/modules/views] 01:35 AM [YesCT] (spelling-15) 578 $ git status # On branch spelling-15 nothing to commit (working directory clean) [~/foo/d8-git/core/modules/views] 01:35 AM [YesCT] (spelling-15) 579 $ git diff 8.x [~/foo/d8-git/core/modules/views] 01:36 AM [YesCT] (spelling-15) 580 $ curl -O http://drupal.org/files/views-spelling-mistake-1844276-14.patch % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 1295 100 1295 0 0 8306 0 --:--:-- --:--:-- --:--:-- 16602 [~/foo/d8-git/core/modules/views] 01:36 AM [YesCT] (spelling-15) 581 $ git apply views-spelling-mistake-1844276-14.patch [~/foo/d8-git/core/modules/views] 01:36 AM [YesCT] (spelling-15) 582 $ cat views-spelling-mistake-1844276-14.patch From 9bbcf1853557e73678497f5be63279e2a59a707e Mon Sep 17 00:00:00 2001 From: mducharme Date: Sun, 25 Nov 2012 21:52:20 -0500 Subject: [PATCH] Issue #1844276 by mducharme: Forward port to D8 - Fixed spelling mistake --- lib/Drupal/views/Plugin/views/filter/Combine.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Drupal/views/Plugin/views/filter/Combine.php b/lib/Drupal/views/Plugin/views/filter/Combine.php index c43d5b3..25a0837 100644 --- a/lib/Drupal/views/Plugin/views/filter/Combine.php +++ b/lib/Drupal/views/Plugin/views/filter/Combine.php @@ -72,14 +72,14 @@ class Combine extends String { } if ($fields) { $count = count($fields); - $seperated_fields = array(); + $separated_fields = array(); foreach ($fields as $key => $field) { - $seperated_fields[] = $field; + $separated_fields[] = $field; if ($key < $count-1) { - $seperated_fields[] = "' '"; + $separated_fields[] = "' '"; } } - $expression = implode(', ', $seperated_fields); + $expression = implode(', ', $separated_fields); $expression = "CONCAT_WS(' ', $expression)"; $info = $this->operators(); -- 1.7.9.6 (Apple Git-31.1) [~/foo/d8-git/core/modules/views] 01:36 AM [YesCT] (spelling-15) 583 $ git status # On branch spelling-15 nothing to commit (working directory clean) [~/foo/d8-git/core/modules/views] 01:36 AM [YesCT] (spelling-15) 584 $