Author: Jonathan.Wage
Date: 2010-02-17 01:46:17 +0100 (Wed, 17 Feb 2010)
New Revision: 28066

Modified:
   plugins/sfSympalPlugin/trunk/data/bin/installer.php
   plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
Log:
[1.4][sfSympalPlugin][1.0] Removing requirement to use enableAllPluginsExcept 
manually in your ProjectConfiguration. Sympal requires it so it is done 
automatically for us now


Modified: plugins/sfSympalPlugin/trunk/data/bin/installer.php
===================================================================
--- plugins/sfSympalPlugin/trunk/data/bin/installer.php 2010-02-17 00:17:57 UTC 
(rev 28065)
+++ plugins/sfSympalPlugin/trunk/data/bin/installer.php 2010-02-17 00:46:17 UTC 
(rev 28066)
@@ -86,7 +86,6 @@
 $manipulator = 
sfClassManipulator::fromFile(sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php');
 $manipulator->wrapMethod('setup', '', 
'require_once(dirname(__FILE__).\'/../plugins/sfSympalPlugin/config/sfSympalPluginConfiguration.class.php\');');
 $manipulator->wrapMethod('setup', '', 
'sfSympalPluginConfiguration::enableSympalPlugins($this);');
-$manipulator->wrapMethod('setup', '', 
'$this->enableAllPluginsExcept(\'sfPropelPlugin\');');
 $manipulator->save();
 
 $this->logSection('sympal', '...downloading sfSympalPlugin');

Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php    
2010-02-17 00:17:57 UTC (rev 28065)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php    
2010-02-17 00:46:17 UTC (rev 28066)
@@ -58,6 +58,17 @@
     $this->_configuration->setPluginPath('sfSympalPlugin', 
$this->_sympalPluginPath);
 
     $this->enableSympalCorePlugins(sfSympalPluginConfiguration::$dependencies);
+
+    // Enable all plugins
+    $allPlugins = array_keys($this->_configuration->getAllPluginPaths());
+    $allPlugins = array_merge(
+      $this->_configuration->getPlugins(), 
+      sfSympalPluginConfiguration::$dependencies,
+      $allPlugins
+    );
+    $allPlugins = array_unique($allPlugins);
+    $this->_configuration->setPlugins($allPlugins);
+    $this->_configuration->disablePlugins('sfPropelPlugin');
   }
 
   /**

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