diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index eb18007d30..634caf4ffb 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Koz] + * Added config.plugins to control which plugins are loaded #6269 [skaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example: config.plugins = %w[ routing_navigator simply_helpful ] diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 1400930768..ba651a2a03 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -83,6 +83,7 @@ module Rails set_autoload_paths load_environment + initialize_encoding initialize_database initialize_logger initialize_framework_logging @@ -197,6 +198,13 @@ module Rails ActiveRecord::Base.instantiate_observers end + # This initialzation sets $KCODE to 'u' to enable the multibyte safe operations. + # Plugin authors supporting other encodings should override this behaviour and + # set the relevant +default_charset+ on ActionController::Base + def initialize_encoding + $KCODE='u' + end + # This initialization routine does nothing unless <tt>:active_record</tt> # is one of the frameworks to load (Configuration#frameworks). If it is, # this sets the database configuration from Configuration#database_configuration |