Branch 'roundcubemail-plugins-kolab-format2-horde5' - plugins/libkolab
Thomas Brüderli
bruederli at kolabsys.com
Wed Feb 20 10:30:45 CET 2013
plugins/libkolab/lib/kolab_format.php | 6 +++---
plugins/libkolab/lib/kolab_storage.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit cae1f34b6bf056435cc695af9e37d246446586b7
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Feb 20 10:30:20 2013 +0100
Convert format versions to strings
diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index 52b7947..0d88ad4 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -39,7 +39,7 @@ abstract class kolab_format
protected $xmldata;
protected $kolab_object;
protected $loaded = false;
- protected $version = 2.0;
+ protected $version = '2.0';
const KTYPE_PREFIX = 'application/x-vnd.kolab.';
const PRODUCT_ID = 'Roundcube-libkolab-horde-0.9';
@@ -52,7 +52,7 @@ abstract class kolab_format
* @param string Cached xml data to initialize with
* @return object kolab_format
*/
- public static function factory($type, $version = 2.0, $xmldata = null)
+ public static function factory($type, $version = '2.0', $xmldata = null)
{
if (!isset(self::$timezone))
self::$timezone = new DateTimeZone('UTC');
@@ -79,7 +79,7 @@ abstract class kolab_format
*/
public static function supports($version)
{
- if ($version == 2.0)
+ if ($version == '2.0')
return class_exists('Horde_Kolab_Format_Xml');
return false;
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index 4ea0543..f2b2bf4 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -31,7 +31,7 @@ class kolab_storage
const SERVERSIDE_SUBSCRIPTION = 0;
const CLIENTSIDE_SUBSCRIPTION = 1;
- public static $version = 2.0;
+ public static $version = '2.0';
public static $last_error;
private static $ready = false;
More information about the commits
mailing list