Development

Changeset 10695

You must first sign up to be able to contribute.

Changeset 10695

Show
Ignore:
Timestamp:
08/06/08 02:52:24 (5 years ago)
Author:
dwhittle
Message:

dwhittle: merged changes to branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/1.1/lib/plugin/sfPearRest.class.php

    r5257 r10695  
    2626  public function downloadHttp($url, $lastmodified = null, $accept = false) 
    2727  { 
    28     return parent::downloadHttp($url, $lastmodified, $accept); 
     28    return parent::downloadHttp($url, $lastmodified, array_merge(false !== $accept ? $accept : array(), array("\r\nX-SYMFONY-VERSION: ".SYMFONY_VERSION))); 
    2929  } 
    3030} 

  • branches/dwhittle/1.2/lib/plugin/sfPearRest.class.php

    r5250 r10695  
    2626  public function downloadHttp($url, $lastmodified = null, $accept = false) 
    2727  { 
    28     return parent::downloadHttp($url, $lastmodified, $accept); 
     28    return parent::downloadHttp($url, $lastmodified, array_merge(false !== $accept ? $accept : array(), array("\r\nX-SYMFONY-VERSION: ".SYMFONY_VERSION))); 
    2929  } 
    3030}