phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/inc class.http_dav_client.inc.php


From: Caeies
Subject: [Phpgroupware-cvs] phpgwapi/inc class.http_dav_client.inc.php
Date: Wed, 21 Dec 2005 14:50:54 +0000

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Caeies <address@hidden> 05/12/21 14:50:54

Modified files:
        inc            : class.http_dav_client.inc.php 

Log message:
        fix the fix :( we decode only strings as utf8, not array

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.http_dav_client.inc.php.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: phpgwapi/inc/class.http_dav_client.inc.php
diff -u phpgwapi/inc/class.http_dav_client.inc.php:1.14 
phpgwapi/inc/class.http_dav_client.inc.php:1.15
--- phpgwapi/inc/class.http_dav_client.inc.php:1.14     Fri Dec  2 13:12:25 2005
+++ phpgwapi/inc/class.http_dav_client.inc.php  Wed Dec 21 14:50:54 2005
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage network
-       * @version $Id: class.http_dav_client.inc.php,v 1.14 2005/12/02 
13:12:25 Caeies Exp $
+       * @version $Id: class.http_dav_client.inc.php,v 1.15 2005/12/21 
14:50:54 Caeies Exp $
        * @internal At the moment much of this is simply a wrapper around the 
NET_HTTP_Client class, with some other methods for parsing the returned XML etc 
Ideally this will eventually use groupware's inbuilt HTTP class
        */
 
@@ -512,7 +512,14 @@
                                {
                                        if ($item[$vfs_name])
                                        {
-                                               $newitem[$vfs_name] = 
utf8_decode($item[$vfs_name]);
+                                               if(is_string($item[$vfs_name])
+                                               {
+                                                       $newitem[$vfs_name] = 
utf8_decode($item[$vfs_name]);
+                                               }
+                                               else
+                                               {
+                                                       $newitem[$vfs_name] = 
$item[$vfs_name];
+                                               }
                                        }
                                }
 
@@ -521,7 +528,14 @@
                                {
                                        if ($item[$dav_name])
                                        {
-                                               $newitem[$vfs_name] = 
utf8_decode($item[$dav_name]);
+                                               if(is_string($item[$dav_name]))
+                                               {
+                                                       $newitem[$vfs_name] = 
utf8_decode($item[$dav_name]);
+                                               }
+                                               else
+                                               {
+                                                       $newitem[$vfs_name] = 
$item[$dav_name];
+                                               }
                                        }
                                }
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]