Development

Changeset 9878

You must first sign up to be able to contribute.

Changeset 9878

Show
Ignore:
Timestamp:
06/26/08 08:41:30 (5 months ago)
Author:
fabien
Message:

renamed sfForm::getFormField() to sfForm::getFormFieldSchema()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/form/sfForm.class.php

    r9536 r9878  
    3232    $validatorSchema = null, 
    3333    $errorSchema     = null, 
    34     $formField      = null, 
     34    $formFieldSchema = null, 
    3535    $formFields      = array(), 
    3636    $isBound         = false, 
    …… 
    105105  public function render($attributes = array()) 
    106106  { 
    107     return $this->getFormField()->render($attributes); 
     107    return $this->getFormFieldSchema()->render($attributes); 
    108108  } 
    109109 
    …… 
    677677  { 
    678678    $this->formFields = array(); 
    679     $this->formField = null; 
     679    $this->formFieldSchema = null; 
    680680  } 
    681681 
    …… 
    712712      $class = $widget instanceof sfWidgetFormSchema ? 'sfFormFieldSchema' : 'sfFormField'; 
    713713 
    714       $this->formFields[$name] = new $class($widget, $this->getFormField(), $name, isset($values[$name]) ? $values[$name] : null, $this->errorSchema[$name]); 
     714      $this->formFields[$name] = new $class($widget, $this->getFormFieldSchema(), $name, isset($values[$name]) ? $values[$name] : null, $this->errorSchema[$name]); 
    715715    } 
    716716 
    …… 
    750750   * @return sfFormFieldSchema A sfFormFieldSchema instance 
    751751   */ 
    752   protected function getFormField() 
    753   { 
    754     if (is_null($this->formField)) 
    755     { 
    756       $this->formField = new sfFormFieldSchema($this->widgetSchema, null, null, $this->isBound ? $this->taintedValues : $this->defaults, $this->errorSchema); 
    757     } 
    758  
    759     return $this->formField; 
     752  protected function getFormFieldSchema() 
     753  { 
     754    if (is_null($this->formFieldSchema)) 
     755    { 
     756      $this->formFieldSchema = new sfFormFieldSchema($this->widgetSchema, null, null, $this->isBound ? $this->taintedValues : $this->defaults, $this->errorSchema); 
     757    } 
     758 
     759    return $this->formFieldSchema; 
    760760  } 
    761761