]> git.pld-linux.org Git - packages/dokuwiki.git/commitdiff
- allow require/require_once/include in config files other than just @include
authorElan Ruusamäe <glen@pld-linux.org>
Mon, 19 Nov 2007 23:49:56 +0000 (23:49 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    dokuwiki-config-allow-require.patch -> 1.1

dokuwiki-config-allow-require.patch [new file with mode: 0644]

diff --git a/dokuwiki-config-allow-require.patch b/dokuwiki-config-allow-require.patch
new file mode 100644 (file)
index 0000000..0058482
--- /dev/null
@@ -0,0 +1,11 @@
+--- lib/plugins/config/settings/config.class.php       2007-06-26 21:27:15.000000000 +0300
++++ /usr/share/dokuwiki/lib/plugins/config/settings/config.class.php   2007-11-20 01:42:59.722673768 +0200
+@@ -138,7 +138,7 @@
+         }else{
+             $contents = '';
+         }
+-        $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|@include|$))/s';
++        $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|@?(?:require|include)(?:_once)?|$))/s';
+         $matches=array();
+         preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER);
This page took 0.116273 seconds and 4 git commands to generate.