[Phpgroupware-cvs] property/inc class.bocommon.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/03/18 22:48:57

Modified files:
        inc            : class.bocommon.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.64&r2=1.65

Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- class.bocommon.inc.php      18 Mar 2007 16:26:56 -0000      1.64
+++ class.bocommon.inc.php      18 Mar 2007 22:48:57 -0000      1.65
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.bocommon.inc.php,v 1.64 2007/03/18 16:26:56 
sigurdne Exp $
+       * @version $Id: class.bocommon.inc.php,v 1.65 2007/03/18 22:48:57 
sigurdne Exp $
        */
 
        /**
@@ -1466,6 +1466,8 @@
                */
                function utf2ascii($text = '')
                {       
+                       if($GLOBALS['phpgw_info']['server']['charset']=='utf-8')
+                       {
                        if ($text == utf8_decode($text))
                        {
                                return $text;
@@ -1475,6 +1477,11 @@
                                return utf8_decode($text);
                        }
                }
+                       else
+                       {
+                               return $text;
+                       }
+               }
 
                /**
                * Converts ascii to utf-8