Skip to content
Browse files

Merge pull request #190 from havocp/application-global-config

Change the config option from 'global' to 'application.global' to match docs
  • Loading branch information...
2 parents b5da431 + bf2e51a commit fbfc61b9238755dabac6925e9e4bad1c77940d44 @pk11 pk11 committed Mar 23, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 framework/src/play/src/main/scala/play/api/Application.scala
View
2 framework/src/play/src/main/scala/play/api/Application.scala
@@ -38,7 +38,7 @@ class Application(val path: File, val classloader: ClassLoader, val sources: Opt
// -- Global stuff
- private val globalClass = initialConfiguration.getString("global").getOrElse("Global")
+ private val globalClass = initialConfiguration.getString("application.global").getOrElse("application.Global")
lazy private val javaGlobal: Option[play.GlobalSettings] = try {
Option(classloader.loadClass(globalClass).newInstance().asInstanceOf[play.GlobalSettings])

0 comments on commit fbfc61b

Please sign in to comment.
Something went wrong with that request. Please try again.