diff options
Diffstat (limited to 'lib/plugins/config/settings/config.class.php')
| -rw-r--r-- | lib/plugins/config/settings/config.class.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 1cdab607f..8c48018d7 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -156,7 +156,7 @@ if (!class_exists('configuration')) { }else{ $contents = ''; } - $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|@include|$))/s'; + $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|$))/s'; $matches=array(); preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER); @@ -452,8 +452,8 @@ if (!class_exists('setting')) { function _out_key($pretty=false,$url=false) { if($pretty){ - $out = str_replace(CM_KEYMARKER,"»",$this->_key); - if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc. + $out = str_replace(CM_KEYMARKER,"»",$this->_key); + if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc. if ($out == 'start') //one exception return '<a href="http://www.dokuwiki.org/config:startpage">'.$out.'</a>'; else @@ -548,7 +548,7 @@ if (!class_exists('setting_email')) { if ($value == $input) return false; if ($this->_multiple) { - $mails = array_filter(array_map('trim', split(',', $input))); + $mails = array_filter(array_map('trim', explode(',', $input))); } else { $mails = array($input); } |