Changeset 6823

Timestamp:

12/30/07 08:46:24 (1 year ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch (r6822)

Files:

• branches/dwhittle/1.1/data/config/config_handlers.yml (modified) (2 diffs)
• branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/config/config_handlers.yml (copied) (copied from branches/1.1/lib/plugins/sfCompat10Plugin/config/config_handlers.yml)
• branches/dwhittle/1.1/lib/user/sfUser.class.php (modified) (1 diff)

branches/dwhittle/1.1/data/config/config_handlers.yml

@@ -30 +30 @@
-  class:    sfRoutingConfigHandler
-
-config/i18n.yml:
-  class:    sfDefineEnvironmentConfigHandler
-  param:
-    prefix: sf_i18n_
-
-modules/*/config/generator.yml:
-  class:    sfGeneratorConfigHandler
@@ -40 +35 @@
-modules/*/config/view.yml:
-  class:    sfViewConfigHandler
-
-modules/*/config/mailer.yml:
-  class:    sfDefineEnvironmentConfigHandler
-  param:
-    prefix: sf_mailer_
-    module: yes
-
-modules/*/config/security.yml:

branches/dwhittle/1.1/lib/user/sfUser.class.php

@@ -88 +88 @@
-    // otherwise
-    //  - use the culture defined in the user session
-i18n
+settings
-    $currentCulture = $storage->read(self::CULTURE_NAMESPACE);
-    $this->setCulture($this->getParameter('culture', !is_null($currentCulture) ? $currentCulture : $this->getParameter('default_culture', 'en')));