2 commits - plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_format.php  |    8 ++++----
 plugins/libkolab/lib/kolab_storage.php |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c7303ed5d7e46a6b8ac3c7200f3b0a8521e77a81
Merge: 22c50ad 8dfc52c
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Feb 20 10:31:19 2013 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab



commit 22c50adab03c91277cf5faed299a7152f9fa062a
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Feb 20 09:56:13 2013 +0100

    Backport changes from dev/version_compare branch

diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index b3bb4c4..601d366 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -41,7 +41,7 @@ abstract class kolab_format
     protected $xmldata;
     protected $xmlobject;
     protected $loaded = false;
-    protected $version = 3.0;
+    protected $version = '3.0';
 
     const KTYPE_PREFIX = 'application/x-vnd.kolab.';
     const PRODUCT_ID = 'Roundcube-libkolab-0.9';
@@ -54,7 +54,7 @@ abstract class kolab_format
      * @param string Cached xml data to initialize with
      * @return object kolab_format
      */
-    public static function factory($type, $version = 3.0, $xmldata = null)
+    public static function factory($type, $version = '3.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('kolabobject');
         // default is version 3
         return class_exists('kolabformat');
@@ -299,7 +299,7 @@ abstract class kolab_format
     {
         if (class_exists('kolabobject')) {
             $version = $v ?: $this->version;
-            if ($version <= 2.0)
+            if ($version <= '2.0')
                 return kolabobject::KolabV2;
             else
                 return kolabobject::KolabV3;
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index ebbadf2..a569af7 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -51,7 +51,7 @@ class kolab_storage
 
         $rcmail = rcube::get_instance();
         self::$config = $rcmail->config;
-        self::$version = $rcmail->config->get('kolab_format_version', self::$version);
+        self::$version = strval($rcmail->config->get('kolab_format_version', self::$version));
         self::$imap = $rcmail->get_storage();
         self::$ready = class_exists('kolabformat') &&
             (self::$imap->get_capability('METADATA') || self::$imap->get_capability('ANNOTATEMORE') || self::$imap->get_capability('ANNOTATEMORE2'));