Commit 6c5d19c6 authored by Damien McKenna's avatar Damien McKenna Committed by renatog
Browse files

Issue #3254549 by DamienMcKenna, RenatoG: Tidy variable assertion logic in _link_sanitize()

parent bd2f8f73

link.module

+8 −3
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { 
  }



  // Replace title tokens.

  if ($title && $instance['settings']['enable_tokens']) {

  if ($title !== '' && $instance['settings']['enable_tokens']) {

    $text_tokens = token_scan($title);

    if (!empty($text_tokens)) {

      // Load the entity if necessary for entities in views.
@@ -776,7 +776,7 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { 
      $title = token_replace($title, array($entity_token_type => $entity_loaded));

    }

  }

  if ($title && ($instance['settings']['title'] == 'value' || $instance['settings']['enable_tokens'])) {

  if ($title !== '' && ($instance['settings']['title'] == 'value' || $instance['settings']['enable_tokens'])) {

    $title = filter_xss($title, array(

      'b',

      'br',
@@ -793,7 +793,12 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { 
    ));

    $item['html'] = TRUE;

  }

  $item['title'] = empty($title) && $title !== '0' ? $item['display_url'] : $title;

  if ($title !== '') {

    $item['title'] = $title;

  }

  else {

    $item['title'] = $item['display_url'];

  }



  if (!isset($item['attributes'])) {

    $item['attributes'] = array();