summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorNatanael Copa <natanael.copa@gmail.com>2008-12-27 07:51:47 +0000
committerNatanael Copa <natanael.copa@gmail.com>2008-12-27 07:51:47 +0000
commitf42aa7f97cc50f15158ed4c7ac74c9443ccb64df (patch)
tree441bbcdc3220085edd54cfb2b3ed29a26973544f /app
parente515df7419d1c24d1ca878e8fa29144e561db07e (diff)
downloadacf-core-f42aa7f97cc50f15158ed4c7ac74c9443ccb64df.tar.bz2
acf-core-f42aa7f97cc50f15158ed4c7ac74c9443ccb64df.tar.xz
allow override default_controller in /etc/acf/acf.conf
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1642 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'app')
-rw-r--r--app/acf_www-controller.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua
index 3587578..fb12a6e 100644
--- a/app/acf_www-controller.lua
+++ b/app/acf_www-controller.lua
@@ -220,7 +220,7 @@ mvc.on_load = function (self, parent)
self.conf.sessiondir = self.conf.sessiondir or "/tmp/"
self.conf.script = ENV.SCRIPT_NAME
self.conf.default_prefix = "/"
- self.conf.default_controller = "welcome"
+ self.conf.default_controller = self.conf.default_controller or "welcome"
self.clientdata = FORM
self.conf.clientip = ENV.REMOTE_ADDR