Author: Jonathan.Wage
Date: 2010-01-11 04:47:39 +0100 (Mon, 11 Jan 2010)
New Revision: 26468

Modified:
   plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
Log:
[1.4][sfSympalPlugin][1.0] Removing unnecessary array merge


Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php       
2010-01-11 01:53:21 UTC (rev 26467)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php       
2010-01-11 03:47:39 UTC (rev 26468)
@@ -271,9 +271,9 @@
       if (sfSympalConfig::get('enable_all_modules'))
       {
         $modules = array_merge($modules, $this->getModules());
+      } else {
+        $modules = array_merge($modules, 
sfSympalConfig::get('enabled_modules', null, array()));
       }
-      $modules = array_merge($modules, sfSympalConfig::get('enabled_modules', 
null, array()));
-
       sfConfig::set('sf_enabled_modules', $modules);
     }
   }

-- 
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