From 762fb7d4a171416d5b4ae3386a8ecaa081ad5d23 Mon Sep 17 00:00:00 2001
From: chris <chris@jalakai.co.uk>
Date: Fri, 5 May 2006 02:04:32 +0200
Subject: [PATCH] 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
---
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 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);
--
GitLab