Projet

Général

Profil

Révision f0456308

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/views_data_export/plugins/views_data_export_plugin_display_export.inc
306 306
    // Build up our querystring for the final page callback.
307 307
    $querystring = array(
308 308
      'eid' => $this->batched_execution_state->eid,
309
      'return-url' => NULL,
309 310
    );
310
    // If we were attached to another view, grab that for the final URL.
311
    if (!empty($_GET['attach']) && isset($this->view->display[$_GET['attach']])) {
311

  
312
    // If we have a configured return path, use that.
313
    if ($this->get_option('return_path')) {
314
      $querystring['return-url'] = $this->get_option('return_path');
315
    }
316
    // Else if we were attached to another view, grab that for the final URL.
317
    else if (!empty($_GET['attach']) && isset($this->view->display[$_GET['attach']])) {
312 318
      // Get the path of the attached display:
313 319
      $querystring['return-url'] = $this->view->get_url(NULL, $this->view->display[$_GET['attach']]->handler->get_path());
314 320
    }
315
    else {
316
      $return_path = $this->get_option('return_path');
317
      $querystring['return-url'] = isset($return_path) ? $return_path : NULL;
318
    }
319 321

  
320 322
    //Set the batch off
321 323
    $batch = array(

Formats disponibles : Unified diff