[Fmsystem-commits] [7318] added utf8_decode on xmlrpc-methods

[Erik Holm-Larsen]

Revision: 7318
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7318
Author:   erikhl
Date:     2011-05-27 07:36:26 +0000 (Fri, 27 May 2011)
Log Message:
-----------
added utf8_decode on xmlrpc-methods

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-27 07:23:47 UTC 
(rev 7317)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-27 07:36:26 UTC 
(rev 7318)
@@ -653,12 +653,12 @@
        
        function get_statuscodes()
        {
-               $statuscodes[] = array('id' => '0', 'name' => 'Ingen');
-               $statuscodes[] = array('id' => '1', 'name' => 'Ny');
-               $statuscodes[] = array('id' => '2', 'name' => 'Endring');
-               $statuscodes[] = array('id' => '3', 'name' => 'Akseptert');
-               $statuscodes[] = array('id' => '4', 'name' => 'Behandlet');
-               $statuscodes[] = array('id' => '5', 'name' => 'Avvist');
+               $statuscodes[] = array('id' => '0', 'name' => 
utf8_decode('Ingen'));
+               $statuscodes[] = array('id' => '1', 'name' => 
utf8_decode('Ny'));
+               $statuscodes[] = array('id' => '2', 'name' => 
utf8_decode('Endring'));
+               $statuscodes[] = array('id' => '3', 'name' => 
utf8_decode('Akseptert'));
+               $statuscodes[] = array('id' => '4', 'name' => 
utf8_decode('Behandlet'));
+               $statuscodes[] = array('id' => '5', 'name' => 
utf8_decode('Avvist'));
 
                return $statuscodes;
        }
@@ -670,7 +670,7 @@
                while($this->db->next_record()){
                        $targets[] = array(
                                        'id'                            => 
(int) $this->db->f('id'),
-                                       'name'                          => 
$this->db->f('name',true),
+                                       'name'                          => 
utf8_decode($this->db->f('name',true)),
                        );
                }
                return $targets;
@@ -683,7 +683,7 @@
                while($this->db->next_record()){
                        $categories[] = array(
                                        'id'                            => 
(int) $this->db->f('id'),
-                                       'name'                          => 
$this->db->f('name',true),
+                                       'name'                          => 
utf8_decode($this->db->f('name',true)),
                        );
                }
                return $categories;