Author: Lars Michelsen <[email protected]>
Date: Mon Apr 16 13:07:50 2012 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Mon Apr 16 13:08:53 2012 +0200
Bugfix: Made shortly introduced recoding of map config files optional
Conflicts:
share/server/core/classes/GlobalMapCfg.php
---
ChangeLog | 3 +++
share/server/core/classes/GlobalMapCfg.php | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ca057f3..2aaa02e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
Frontend
* Bugfix: Fixed JS error in template object management dialog
+Core
+ * Bugfix: Made shortly introduced recoding of map config files optional
+
1.6.5
Core
* Added line_weather_colors option to nagvis.ini.php [defaults] section
diff --git a/share/server/core/classes/GlobalMapCfg.php
b/share/server/core/classes/GlobalMapCfg.php
index 99a0cf0..7dea381 100644
--- a/share/server/core/classes/GlobalMapCfg.php
+++ b/share/server/core/classes/GlobalMapCfg.php
@@ -316,8 +316,10 @@ class GlobalMapCfg {
if($file[$l] == '')
continue;
- // Fix ISO-8859-1 encoding. Convert to UTF-8
- if(mb_detect_encoding($file[$l], 'UTF-8, ISO-8859-1') ==
'ISO-8859-1')
+ // Fix ISO-8859-1 encoding. Convert to UTF-8. The mbstring
extension might
+ // be misssing. Simply skip this in that case.
+ if(function_exists('mb_detect_encoding')
+ && mb_detect_encoding($file[$l], 'UTF-8, ISO-8859-1') ==
'ISO-8859-1')
$file[$l] = utf8_encode($file[$l]);
// Don't recognize comments and empty lines, do nothing with
ending delimiters
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
