Author: ornicar2
Date: 2010-02-11 03:09:26 +0100 (Thu, 11 Feb 2010)
New Revision: 27879

Modified:
   
plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php
   
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmMediaLibrary/config/security.yml
Log:
[Diem][dmMediaUploadifyerPlugin]
- made admin routing config handler load Diem routes in last position

Modified: 
plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php
===================================================================
--- 
plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php
   2010-02-11 02:06:15 UTC (rev 27878)
+++ 
plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php
   2010-02-11 02:09:26 UTC (rev 27879)
@@ -47,8 +47,8 @@
   static public function getConfiguration(array $configFiles)
   {
     return array_merge(
-      self::getDmConfiguration(),
-      parent::getConfiguration($configFiles)
+      parent::getConfiguration($configFiles),
+      self::getDmConfiguration()
     );
   }
 

Modified: 
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmMediaLibrary/config/security.yml
===================================================================
--- 
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmMediaLibrary/config/security.yml
   2010-02-11 02:06:15 UTC (rev 27878)
+++ 
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmMediaLibrary/config/security.yml
   2010-02-11 02:09:26 UTC (rev 27879)
@@ -1,5 +1,2 @@
 all:
-  credentials:  media_library
-  
-editImageSave:
-  is_secure:    false
\ No newline at end of file
+  credentials:  media_library
\ No newline at end of file

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.

Reply via email to