diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 603ae3b8343d5f81d3adc2ee74d4c2a6aa51e716..0b93b882d3c07b95f54d72f3e0f02f90fa1c4216 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);