Projet

Général

Profil

Révision c304a780

Ajouté par Assos Assos il y a environ 6 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ctools/includes/stylizer.inc
202 202
}
203 203

  
204 204
/**
205
 * Get the path where images will be stored for a given style plugin and settings.
205
 * Get the path where images will be stored for a style plugin and settings.
206 206
 *
207 207
 * This function will make sure the path exists.
208 208
 */
......
249 249
    if (is_string($plugin['actions']) && function_exists($plugin['actions'])) {
250 250
      $actions = $plugin['actions']($plugin, $settings);
251 251
    }
252
    else if (is_array($plugin['actions'])) {
252
    elseif (is_array($plugin['actions'])) {
253 253
      $actions = $plugin['actions'];
254 254
    }
255 255

  
......
318 318
  function command_load($name, $file) {
319 319
    $this->log("New workspace: $name (from $file)");
320 320
    if (!file_exists($file)) {
321
      // Try it relative to the plugin
321
      // Try it relative to the plugin.
322 322
      $file = $this->plugin['path'] . '/' . $file;
323 323
      if (!file_exists($file)) {
324 324
        $this->log("Unable to open $file");
......
336 336
  }
337 337

  
338 338
  /**
339
   * Create a new workspace using the properties of an existing workspace
339
   * Create a new workspace using the properties of an existing workspace.
340 340
   */
341 341
  function command_new_from($name, $workspace) {
342 342
    $this->log("New workspace: $name from existing $workspace");
......
372 372
  function command_merge_from($workspace, $x = 0, $y = 0) {
373 373
    $this->log("Merge from: $workspace ($x, $y)");
374 374
    if (empty($this->workspaces[$workspace])) {
375
      $this->log("Workspace $name does not exist.", 'error');
375
      $this->log("Workspace $workspace does not exist.", 'error');
376 376
      return;
377 377
    }
378 378

  
......
382 382
  function command_merge_to($workspace, $x = 0, $y = 0) {
383 383
    $this->log("Merge to: $workspace ($x, $y)");
384 384
    if (empty($this->workspaces[$workspace])) {
385
      $this->log("Workspace $name does not exist.", 'error');
385
      $this->log("Workspace $workspace does not exist.", 'error');
386 386
      return;
387 387
    }
388 388

  
......
822 822
    if ($op == 'add' && isset($plugin['add form'])) {
823 823
      $id = $plugin['add form'];
824 824
    }
825
    else if (isset($plugin['edit form'])) {
825
    elseif (isset($plugin['edit form'])) {
826 826
      $id = $plugin['edit form'];
827 827
    }
828 828
    else {

Formats disponibles : Unified diff