diff options
author | chris <chris@jalakai.co.uk> | 2006-05-05 02:04:32 +0200 |
---|---|---|
committer | chris <chris@jalakai.co.uk> | 2006-05-05 02:04:32 +0200 |
commit | 762fb7d4a171416d5b4ae3386a8ecaa081ad5d23 (patch) | |
tree | 0987df9ceb0af7b0ba1be0cbc3ff75bf90e9998b | |
parent | 7774aa3f9e20157f7e4437cf8c7b77e74667a8df (diff) | |
download | rpg-762fb7d4a171416d5b4ae3386a8ecaa081ad5d23.tar.gz rpg-762fb7d4a171416d5b4ae3386a8ecaa081ad5d23.tar.bz2 |
fix more ';' in config values
a more robust fix is needed, but this should resolve 99.9% of potential problems
darcs-hash:20060505000432-9b6ab-273277892e7b7dc978f7622174de38212155f104.gz
-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 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); |