diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-07-08 20:57:22 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-07-08 20:57:22 +0200 |
| commit | 499add6b1673fdc5539e698517dbae3728b1e394 (patch) | |
| tree | edf4302d2ae59f2e8bcf64decdeb10a20b445a8e | |
| parent | f4c788ee87e2a5de27fd70cd38490ef6d0cb7aa5 (diff) | |
| download | rpg-499add6b1673fdc5539e698517dbae3728b1e394.tar.gz rpg-499add6b1673fdc5539e698517dbae3728b1e394.tar.bz2 | |
no longer allow include statements in local.conf.php
as discussed at https://github.com/splitbrain/dokuwiki/pull/115
| -rw-r--r-- | lib/plugins/config/settings/config.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index a1430016e..29d21f8a3 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -156,7 +156,7 @@ if (!class_exists('configuration')) { }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); |