Changeset 7659

Timestamp:

02/28/08 11:09:58 (1 year ago)

Author:

fabien

Message:

fixed sfPluginManager when passing a fully qualified plugin name as a first argument

Files:

• branches/1.1/lib/plugin/sfPluginManager.class.php (modified) (3 diffs)

branches/1.1/lib/plugin/sfPluginManager.class.php

@@ -118 +118 @@
-  protected function doInstallPlugin($plugin, $options = array())
-  {
+    if (false !== strpos($plugin, '/'))
+    {
+      list($options['channel'], $plugin) = explode('/', $plugin);
+    }
+
-    $channel   = isset($options['channel']) ? $options['channel'] : $this->environment->getConfig()->get('default_channel');
-    $stability = isset($options['stability']) ? $options['stability'] : $this->environment->getConfig()->get('preferred_state', null, $channel);
@@ -140 +145 @@
-      }
-
-is_null($version)
+!$version
-      {
-        $version = $this->getPluginVersion($plugin, $stability);
@@ -256 +261 @@
-  public function uninstallPlugin($plugin, $channel = null)
-  {
+    if (false !== strpos($plugin, '/'))
+    {
+      list($channel, $plugin) = explode('/', $plugin);
+    }
+
-    $channel = is_null($channel) ? $this->environment->getConfig()->get('default_channel') : $channel;
-