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/includes/view.inc
1150 1150
      $cache = $this->display_handler->get_plugin('cache');
1151 1151
    }
1152 1152
    if ($cache && $cache->cache_get('results')) {
1153
      if($this->query->pager->use_pager()) {
1153
      if($this->query->pager->use_pager() || !empty($this->get_total_rows)) {
1154 1154
        $this->query->pager->total_items = $this->total_rows;
1155 1155
        $this->query->pager->update_page_info();
1156 1156
      }
......
2102 2102
   * Determine whether a view supports admin string translation.
2103 2103
   */
2104 2104
  function is_translatable() {
2105
    // Use translation no matter what type of view.
2106
    if (variable_get('views_localize_all', FALSE)) {
2107
      return TRUE;
2108
    }
2105 2109
    // If the view is normal or overridden, use admin string translation.
2106 2110
    // A newly created view won't have a type. Accept this.
2107 2111
    return (!isset($this->type) || in_array($this->type, array(t('Normal'), t('Overridden')))) ? TRUE : FALSE;
......
2566 2570
  var $display_options;
2567 2571

  
2568 2572
  var $db_table = 'views_display';
2569
  function views_display($init = TRUE) {
2573
  function __construct($init = TRUE) {
2570 2574
    parent::init($init);
2571 2575
  }
2572 2576

  

Also available in: Unified diff