Development

Changeset 6992

You must first sign up to be able to contribute.

Changeset 6992

Show
Ignore:
Timestamp:
01/08/08 02:03:53 (11 months ago)
Author:
dwhittle
Message:

dwhittle: merged changes to branch (r6991)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/1.0/lib/response/sfWebResponse.class.php

    r6795 r6992  
    235235  public function setContentType($value) 
    236236  { 
    237     // add charset if needed on text/*, *xml 
     237    // add charset if needed (only on text content) 
    238238    if (false === stripos($value, 'charset') && (0 === stripos($value, 'text/') || strlen($value) - 3 === strripos($value, 'xml'))) 
    239239    { 

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

    r6971 r6992  
    114114   * @param array An array of uploaded files (in the $_FILES or $_GET format) 
    115115   */ 
    116   public function bind($taintedValues, $taintedFiles = array()) 
     116  public function bind(array $taintedValues = null, array $taintedFiles = array()) 
    117117  { 
    118118    $this->taintedValues = $taintedValues; 
    …… 
    120120    $this->isBound = true; 
    121121    $this->resetFormFields(); 
     122 
     123    if (is_null($this->taintedValues)) 
     124    { 
     125      $this->taintedValues = array(); 
     126    } 
    122127 
    123128    try 
    …… 
    650655   * @return array An array of re-ordered uploaded file information 
    651656   */ 
    652   static public function convertFileInformation($taintedFiles) 
     657  static public function convertFileInformation(array $taintedFiles) 
    653658  { 
    654659    return self::pathsToArray(preg_replace('#^(/[^/]+)?(/name|/type|/tmp_name|/error|/size)([^\s]*)( = [^\n]*)#m', '$1$3$2$4', self::arrayToPaths($taintedFiles))); 

  • branches/dwhittle/1.1/lib/response/sfWebResponse.class.php

    r6795 r6992  
    247247  public function setContentType($value) 
    248248  { 
    249     // add charset if needed on text/*, *xml 
     249    // add charset if needed (only on text content) 
    250250    if (false === stripos($value, 'charset') && (0 === stripos($value, 'text/') || strlen($value) - 3 === strripos($value, 'xml'))) 
    251251    { 

  • branches/dwhittle/1.1/lib/validator/sfValidatorSchema.class.php

    r6962 r6992  
    141141      } 
    142142 
    143       unset($unused[array_search($name, $unused)]); 
     143      unset($unused[array_search($name, $unused, true)]); 
    144144 
    145145      // validate value 
    …… 
    166166      catch (sfValidatorError $e) 
    167167      { 
     168        $clean[$name] = null; 
     169 
    168170        $errorSchema->addError($e, (string) $name); 
    169171      } 

  • branches/dwhittle/NOTES

    r6574 r6992  
    3333    * changed default settings to be more generic 
    3434 
    35   Enivronments: 
     35  Environments: 
    3636    * added cli environment for symfony command line + tasks + batch scripts 
    3737    * addition of qa + staging environments