Merge pull request #94 from symfony-cmf/di-media-create-prepend

only prepend an image path to CreateBundle if MediaBundle is not present

Author: lsmith77

DependencyInjection/CmfCoreExtension.php

@@ -73,12 +73,16 @@ public function prepend(ContainerBuilder $container)
                             'persistence' => array(
                                 'phpcr' => array(
                                     'enabled' => $persistenceConfig['enabled'],
-                                    'image' => array(
-                                        'basepath' => $persistenceConfig['basepath'].'/media',
-                                    )
                                 )
                             )
                         );
+                        // if cmf_media is there, it will prepend the image path to its media_basepath
+                        // setting.
+                        if (!isset($extensions['cmf_media'])) {
+                            $prependConfig['persistence']['phpcr']['image'] = array(
+                                'basepath' => $persistenceConfig['basepath'].'/media',
+                            );
+                        }
                         break;
                     case 'cmf_media':
                         $prependConfig = array(