From ab2e92f65a0842c9d2b985e7bae960b1c915fd31 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 5 Oct 2010 17:23:57 -0400 Subject: [PATCH] MFB - fix return data structure Bug: 9277 --- framework/SyncML/SyncML/Device/Nokia.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/framework/SyncML/SyncML/Device/Nokia.php b/framework/SyncML/SyncML/Device/Nokia.php index 27a795f6c..b4cfa016c 100644 --- a/framework/SyncML/SyncML/Device/Nokia.php +++ b/framework/SyncML/SyncML/Device/Nokia.php @@ -42,6 +42,24 @@ class SyncML_Device_Nokia extends SyncML_Device { return array($content, $contentType); } + /** + * Converts the content from the backend to a format suitable for the + * client device. + * + * Strips the UID (primary key) information as client and server might use + * different ones. + * + * Charset conversions might be added here too. + * + * @param string $content The content to convert + * @param string $contentType The content type of content as returned + * from the backend + * @param string $database The server database URI. + * + * @return array Three-element array with the converted content, the + * (possibly changed) new content type, and encoding type + * (like b64 as used by Funambol). + */ function convertServer2Client($content, $contentType, $database) { $database = $GLOBALS['backend']->_normalize($database); @@ -57,7 +75,7 @@ class SyncML_Device_Nokia extends SyncML_Device { SYNCML_LOGFILE_DATA, "\nOutput converted for client ($contentType):\n$content\n"); - return array($content, $contentType); + return array($content, $contentType, null); } function handleTasksInCalendar() -- 2.11.0