summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/plugins/config/settings/config.class.php2
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 603ae3b83..0b93b882d 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -125,7 +125,7 @@ if (!class_exists('configuration')) {
if ($this->_format == 'php') {
$contents = @php_strip_whitespace($file);
- $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);/';
+ $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|@include|$))/';
$matches=array();
preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER);