Project

General

Profile

Revision 01f36513

Added by Assos Assos about 6 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/webform/includes/webform.webformconditionals.inc
208 208
          $nodes[$id]['out'] = array();
209 209
        }
210 210

  
211
        // Check for a cyclic graph (circular dependency)
211
        // Check for a cyclic graph (circular dependency).
212 212
        foreach ($nodes as $id => $n) {
213 213
          if ($n['in'] || $n['out']) {
214 214
            $errors[$page_num][] = t('A circular reference involving %name was found.',
......
216 216
          }
217 217
        }
218 218

  
219
      } // End finishing previous page
219
      } // End finishing previous page.
220 220

  
221
    } // End component loop
221
    } // End component loop.
222 222

  
223 223
    // Create an empty page map for the preview page.
224 224
    $page_map[$page_num + 1] = array();
......
313 313
  protected $resultStack;
314 314

  
315 315
  /**
316
   * Initializes an execution stack for a conditional group's rules and
317
   * sub-conditional rules.
316
   * Initializes an execution stack for a conditional group's rules.
317
   *
318
   * Also initializes sub-conditional rules.
318 319
   */
319 320
  public function executionStackInitialize($andor) {
320 321
    $this->stackPointer = -1;
......
355 356
  }
356 357

  
357 358
  /**
358
   * Executes the conditionals on a submission, removing any data which should
359
   * be hidden.
359
   * Executes the conditionals on a submission.
360
   *
361
   * This removes any data which should be hidden.
360 362
   */
361 363
  public function executeConditionals($input_values, $page_num = 0) {
362 364
    $this->getOrder();
......
510 512
  }
511 513

  
512 514
  /**
515
   * Returns the required status for a component.
516
   *
513 517
   * Returns whether a given component is always hidden, always shown, or might
514 518
   * be shown depending upon other sources on the same page.
515 519
   *
......
533 537
  }
534 538

  
535 539
  /**
536
   * Returns whether a given page should be displayed. This requires any
537
   * conditional for the page itself to be shown, plus at least one component
538
   * within the page must be shown too. The first and preview pages are always
539
   * shown, however.
540
   * Returns whether a given page should be displayed.
541
   *
542
   * This requires any conditional for the page itself to be shown, plus at
543
   * least one component within the page must be shown too. The first and
544
   * preview pages are always shown, however.
540 545
   *
541 546
   * @param int $page_num
542 547
   *   The page number that the component is on.
......
561 566
  }
562 567

  
563 568
  /**
569
   * Returns the required status for a component.
570
   *
564 571
   * Returns whether a given component is always required, always optional, or
565 572
   * unchanged by conditional logic.
566 573
   *

Also available in: Unified diff