Project

General

Profile

Revision d719f12f

Added by Assos Assos over 8 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/views/plugins/views_plugin_display.inc
739 739
  function uses_link_display() { return !$this->has_path(); }
740 740

  
741 741
  /**
742
   * Check to see if the display can put the exposed formin a block.
742
   * Check to see if the display can put the exposed form in a block.
743 743
   *
744 744
   * By default, displays that do not have a path cannot disconnect
745 745
   * the exposed form and put it in a block, because the form has no
......
1150 1150
      );
1151 1151
    }
1152 1152

  
1153
    $display_comment = check_plain(drupal_substr($this->get_option('display_comment'), 0, 10));
1153
    $display_comment = check_plain(views_ui_truncate($this->get_option('display_comment'), 80));
1154 1154
    $options['display_comment'] = array(
1155 1155
      'category' => 'other',
1156 1156
      'title' => t('Comment'),
......
1419 1419
    }
1420 1420
    $form['#title'] = check_plain($this->display->display_title) . ': ';
1421 1421

  
1422
    // Set the 'section' to hilite on the form.
1422
    // Set the 'section' to highlight on the form.
1423 1423
    // If it's the item we're looking at is pulling from the default display,
1424 1424
    // reflect that. Don't use is_defaulted since we want it to show up even
1425 1425
    // on the default display.
......
1573 1573
        $plugin = $this->get_plugin('access');
1574 1574
        $form['#title'] .= t('Access options');
1575 1575
        if ($plugin) {
1576
          $form['#help_topic'] = $plugin->definition['help topic'];
1577
          $form['#help_module'] = $plugin->definition['module'];
1576
          if (!empty($plugin->definition['help topic'])) {
1577
            $form['#help_topic'] = $plugin->definition['help topic'];
1578
          }
1579
          if (!empty($plugin->definition['module'])) {
1580
            $form['#help_module'] = $plugin->definition['module'];
1581
          }
1578 1582

  
1579 1583
          $form['access_options'] = array(
1580 1584
            '#tree' => TRUE,
......
1615 1619
        $plugin = $this->get_plugin('cache');
1616 1620
        $form['#title'] .= t('Caching options');
1617 1621
        if ($plugin) {
1618
          $form['#help_topic'] = $plugin->definition['help topic'];
1619
          $form['#help_module'] = $plugin->definition['module'];
1622
          if (!empty($plugin->definition['help topic'])) {
1623
            $form['#help_topic'] = $plugin->definition['help topic'];
1624
          }
1625
          if (!empty($plugin->definition['module'])) {
1626
            $form['#help_module'] = $plugin->definition['module'];
1627
          }
1620 1628

  
1621 1629
          $form['cache_options'] = array(
1622 1630
            '#tree' => TRUE,
......
1635 1643
        $form['#title'] .= t('Query options');
1636 1644
        $this->view->init_query();
1637 1645
        if ($this->view->query) {
1638
          if (isset($this->view->query->definition['help topic'])) {
1646
          if (!empty($this->view->query->definition['help topic'])) {
1639 1647
            $form['#help_topic'] = $this->view->query->definition['help topic'];
1640 1648
          }
1641

  
1642
          if (isset($this->view->query->definition['module'])) {
1649
          if (!empty($this->view->query->definition['module'])) {
1643 1650
            $form['#help_module'] = $this->view->query->definition['module'];
1644 1651
          }
1645 1652

  
......
1734 1741
        }
1735 1742
        $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
1736 1743
        if ($plugin) {
1737
          if (isset($plugin->definition['help topic'])) {
1744
          if (!empty($plugin->definition['help topic'])) {
1738 1745
            $form['#help_topic'] = $plugin->definition['help topic'];
1746
          }
1747
          if (!empty($plugin->definition['module'])) {
1739 1748
            $form['#help_module'] = $plugin->definition['module'];
1740 1749
          }
1741 1750
          $form[$form_state['section']] = array(
......
2117 2126
        $plugin = $this->get_plugin('exposed_form');
2118 2127
        $form['#title'] .= t('Exposed form options');
2119 2128
        if ($plugin) {
2120
          $form['#help_topic'] = $plugin->definition['help topic'];
2129
          if (!empty($plugin->definition['help topic'])) {
2130
            $form['#help_topic'] = $plugin->definition['help topic'];
2131
          }
2132
          if (!empty($plugin->definition['module'])) {
2133
            $form['#help_module'] = $plugin->definition['module'];
2134
          }
2121 2135

  
2122 2136
          $form['exposed_form_options'] = array(
2123 2137
            '#tree' => TRUE,
......
2154 2168
        $plugin = $this->get_plugin('pager');
2155 2169
        $form['#title'] .= t('Pager options');
2156 2170
        if ($plugin) {
2157
          $form['#help_topic'] = $plugin->definition['help topic'];
2171
          if (!empty($plugin->definition['help topic'])) {
2172
            $form['#help_topic'] = $plugin->definition['help topic'];
2173
          }
2174
          if (!empty($plugin->definition['module'])) {
2175
            $form['#help_module'] = $plugin->definition['module'];
2176
          }
2158 2177

  
2159 2178
          $form['pager_options'] = array(
2160 2179
            '#tree' => TRUE,

Also available in: Unified diff