Author: Wolfgang <[email protected]>
Date: Fri Mar 22 23:33:18 2013 +0100
Committer: Wolfgang <[email protected]>
Commit-Date: Fri Mar 22 23:33:18 2013 +0100
bugfix: wrong match for http_proxy_auth; "array to string conversion" error
---
share/server/core/classes/GlobalMainCfg.php | 2 +-
share/server/core/defines/matches.php | 1 +
share/server/core/sources/geomap.php | 4 ++++
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/share/server/core/classes/GlobalMainCfg.php
b/share/server/core/classes/GlobalMainCfg.php
index 2924989..eb216c5 100644
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
@@ -134,7 +134,7 @@ class GlobalMainCfg {
'http_proxy_auth' => array(
'must' => 0,
'default' => null,
- 'match' => MATCH_STRING,
+ 'match' => MATCH_NOT_EMPTY,
),
'http_timeout' => array(
'must' => 1,
diff --git a/share/server/core/defines/matches.php
b/share/server/core/defines/matches.php
index b421b71..09b962c 100644
--- a/share/server/core/defines/matches.php
+++ b/share/server/core/defines/matches.php
@@ -26,6 +26,7 @@
* @author Lars Michelsen <[email protected]>
*/
define('MATCH_ALL', '/^.*$/i');
+define('MATCH_NOT_EMPTY', '/^.+$/');
define('MATCH_REGEX', '/^.*$/i');
// These regex allow unicode matching
diff --git a/share/server/core/sources/geomap.php
b/share/server/core/sources/geomap.php
index 1ebd464..f9a4489 100644
--- a/share/server/core/sources/geomap.php
+++ b/share/server/core/sources/geomap.php
@@ -200,6 +200,10 @@ function geomap_files($params) {
// The source_file parameter was filtered here in previous versions. Users
// reported that this is not very useful. So I removed it. Hope it works
// for most users.
+ // FIXME: the following two "unset" statements fix an "array to string
conversion" error
+ unset ($params['filter_group']);
+ unset ($params['sources']);
+
$image_name = 'geomap-'.implode('_', array_values($params)).'.png';
return array(
$image_name,
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
