Author: Lars Michelsen <[email protected]>
Date: Tue Oct 23 12:00:47 2012 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Oct 23 12:00:47 2012 +0200
Bugfix: Fixed invalid json output on uncached geomap rendering
---
ChangeLog | 1 +
share/server/core/sources/geomap.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b1bf5cd..add206a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
1.7.3
Core:
* Bugfix: Fixed problem in geomap exception handling
+ * Bugfix: Fixed invalid json output on uncached geomap rendering
Frontend:
* Hiding rotations table on overview page when no rotations configured
diff --git a/share/server/core/sources/geomap.php
b/share/server/core/sources/geomap.php
index c7c684f..cdce125 100644
--- a/share/server/core/sources/geomap.php
+++ b/share/server/core/sources/geomap.php
@@ -239,7 +239,7 @@ function process_geomap($MAPCFG, $map_name, &$map_config) {
}
if(!preg_match('/^-?[0-9]+\.?[0-9]*,-?[0-9]+\.?[0-9]*,-?[0-9]+\.?[0-9]*,-?[0-9]+\.?[0-9]*$/i',
$contents))
- throw new GeomapError(l('Got invalid data from "[U]": "[C]"',
array('U' => $data_url, 'C' => var_dump($contents))));
+ throw new GeomapError(l('Got invalid data from "[U]": "[C]"',
array('U' => $data_url, 'C' => json_encode($contents))));
file_put_contents($data_path, $contents);
$parts = explode(',', $contents);
------------------------------------------------------------------------------
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_sfd2d_oct
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
