Changeset 8550

Timestamp:

04/19/08 03:23:52 (1 year ago)

Author:

fabien

Message:

added a sfApplicationConfiguration::activate() method to pop/push sfConfig values when changing context (closes #3354)

Files:

• branches/1.1/lib/config/sfApplicationConfiguration.class.php (modified) (4 diffs)
• branches/1.1/lib/util/sfContext.class.php (modified) (1 diff)

branches/1.1/lib/config/sfApplicationConfiguration.class.php

@@ -23 +23 @@
-    $application = null,
-    $environment = null,
-
+
+
-
-  /**
@@ -56 +57 @@
-
-    $this->initialize();
+
+    // store current sfConfig values
+    $this->config = sfConfig::getAll();
-  }
-
@@ -76 +80 @@
-  }
-
+  public function activate()
+  {
+    sfConfig::clear();
+    sfConfig::add($this->config);
+  }
+
-  /**
-   * @see sfProjectConfiguration
@@ -82 +92 @@
-  {
-    // in debug mode, start global timer
-
+ && !sfConfig::get('sf_timer_start')
-    {
-      sfConfig::set('sf_timer_start', microtime(true));

branches/1.1/lib/util/sfContext.class.php

@@ -172 +172 @@
-  public static function switchTo($name)
-  {
+    if (!isset(self::$instances[$name]))
+    {
+      $currentConfiguration = sfContext::getInstance()->getConfiguration();
+      sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration($name, $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug()));
+    }
+
-    self::$current = $name;
+
+    sfContext::getInstance()->getConfiguration()->activate();
-  }
-