Development

Changeset 32419

You must first sign up to be able to contribute.

Changeset 32419

Show
Ignore:
Timestamp:
03/30/11 20:00:17 (4 years ago)
Author:
fabien
Message:

Merge branch 'master' of git://github.com/symfony/symfony

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/2.0/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml

    r32184 r32419  
    77    <parameters> 
    88        <parameter key="doctrine.orm.default_entity_manager">default</parameter> 
    9         <parameter key="doctrine.orm.metadata_cache_driver">array</parameter> 
    10         <parameter key="doctrine.orm.query_cache_driver">array</parameter> 
    11         <parameter key="doctrine.orm.result_cache_driver">array</parameter> 
    129        <parameter key="doctrine.orm.configuration_class">Doctrine\ORM\Configuration</parameter> 
    1310        <parameter key="doctrine.orm.entity_manager_class">Doctrine\ORM\EntityManager</parameter> 
  • branches/2.0/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php

    r32401 r32419  
    4646        } 
    4747 
     48        if (!self::isSupported()) { 
     49            return null; 
     50        } 
     51         
    4852        ob_start(); 
    4953