From 499add6b1673fdc5539e698517dbae3728b1e394 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 8 Jul 2012 20:57:22 +0200 Subject: [PATCH] no longer allow include statements in local.conf.php as discussed at https://github.com/splitbrain/dokuwiki/pull/115 --- lib/plugins/config/settings/config.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index a1430016ef..29d21f8a38 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -156,7 +156,7 @@ function _read_config($file) { }else{ $contents = ''; } - $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|@include|$))/s'; + $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|$))/s'; $matches=array(); preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER);