diff options
| -rw-r--r-- | inc/io.php | 3 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.class.php | 4 | ||||
| -rw-r--r-- | lib/plugins/plugin/admin.php | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/inc/io.php b/inc/io.php index 9c02e87c6..f882d9b36 100644 --- a/inc/io.php +++ b/inc/io.php @@ -294,8 +294,9 @@ function io_download($url,$file,$useAttachment=false,$defaultName=''){ $name = ''; if (isset($http->resp_headers['content-disposition'])) { $content_disposition = $http->resp_headers['content-disposition']; + $match=array(); if (is_string($content_disposition) && - preg_match('/attachment;\s*filename\s*=\s*"([^"]*)"/i', $content_disposition, $match=array())) { + preg_match('/attachment;\s*filename\s*=\s*"([^"]*)"/i', $content_disposition, $match)) { $name = basename($match[1]); } diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 7166dc192..86bb4e9fa 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -124,8 +124,8 @@ if (!class_exists('configuration')) { $contents = @php_strip_whitespace($file); $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);/'; - - preg_match_all($pattern,$contents,$matches=array(),PREG_SET_ORDER); + $matches=array(); + preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER); for ($i=0; $i<count($matches); $i++) { diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php index b808a48f2..8c740e18d 100644 --- a/lib/plugins/plugin/admin.php +++ b/lib/plugins/plugin/admin.php @@ -229,7 +229,8 @@ class ap_manage { global $lang; // check the url - if (!preg_match("/[^\/]*$/", $url, $matches = array()) || !$matches[0]) { + $matches = array(); + if (!preg_match("/[^\/]*$/", $url, $matches) || !$matches[0]) { $this->manager->error = $this->lang['error_badurl']."\n"; return false; } |