From 4b073dcd288c3571763185739a93d5610470d384 Mon Sep 17 00:00:00 2001
From: Christian Lopez Espinola <penyaskito@computer.org>
Date: Sun, 30 Mar 2014 22:35:03 +0200
Subject: [PATCH] Issue #1962358 by penyaskito: Entity::urlInfo() returns a
 Drupal\Core\Url object. See http://drupal.org/node/2215961

---
 token.tokens.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/token.tokens.inc b/token.tokens.inc
index 64ba4ca..3555ccf 100644
--- a/token.tokens.inc
+++ b/token.tokens.inc
@@ -414,7 +414,7 @@ function token_tokens($type, $tokens, array $data = array(), array $options = ar
 
     // Chained token relationships.
     if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, $comment->urlInfo(), $options);
+      $replacements += \Drupal::token()->generate('url', $url_tokens, (array) $comment->urlInfo(), $options);
     }
   }
 
@@ -449,7 +449,7 @@ function token_tokens($type, $tokens, array $data = array(), array $options = ar
       $replacements += \Drupal::token()->generate('content-type', $node_type_tokens, array('node_type' => $node_type), $options);
     }
     if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, $node->urlInfo(), $options);
+      $replacements += \Drupal::token()->generate('url', $url_tokens, (array) $node->urlInfo(), $options);
     }
   }
 
@@ -512,7 +512,7 @@ function token_tokens($type, $tokens, array $data = array(), array $options = ar
 
     // Chained token relationships.
     if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, $term->urlInfo(), $options);
+      $replacements += \Drupal::token()->generate('url', $url_tokens, (array) $term->urlInfo(), $options);
     }
     // [term:parents:*] chained tokens.
     if ($parents_tokens = \Drupal::token()->findWithPrefix($tokens, 'parents')) {
@@ -818,7 +818,7 @@ function token_tokens($type, $tokens, array $data = array(), array $options = ar
 
     // [entity:url:*] chained tokens.
     if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) && _token_module($type, 'url') == 'token') {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, $entity->urlInfo(), $options);
+      $replacements += \Drupal::token()->generate('url', $url_tokens, (array) $entity->urlInfo(), $options);
     }
 
     // [entity:original:*] chained tokens.