Changeset 32419

Timestamp:

03/30/11 20:00:17 (2 years ago)

Author:

fabien

Message:

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

Files:

• branches/2.0/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml (modified) (1 diff)
• branches/2.0/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php (modified) (1 diff)

branches/2.0/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml

@@ -7 +7 @@
-    <parameters>
-        <parameter key="doctrine.orm.default_entity_manager">default</parameter>
-        <parameter key="doctrine.orm.metadata_cache_driver">array</parameter>
-        <parameter key="doctrine.orm.query_cache_driver">array</parameter>
-        <parameter key="doctrine.orm.result_cache_driver">array</parameter>
-        <parameter key="doctrine.orm.configuration_class">Doctrine\ORM\Configuration</parameter>
-        <parameter key="doctrine.orm.entity_manager_class">Doctrine\ORM\EntityManager</parameter>

branches/2.0/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php

@@ -46 +46 @@
-        }
-
+        if (!self::isSupported()) {
+            return null;
+        }
+        
-        ob_start();
-