Cache and allow overriding value of clientType.

horde · Sep 26, 2014 · f8ff845 · f8ff845
1 parent 60d8905
commit f8ff845
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Device.php b/framework/ActiveSync/lib/Horde/ActiveSync/Device.php
@@ -103,6 +103,13 @@ class Horde_ActiveSync_Device
      */
     protected $_multiplexSet = false;
 
+    /**
+     * Local override/cache of detected clientType.
+     *
+     * @var string
+     */
+    protected $_clientType;
+
     /**
      * Const'r
      *
@@ -131,8 +138,10 @@ public function &__get($property)
         case self::BLOCKED:
             return $this->_properties['properties'][$property];
         case 'clientType':
-            $type = $this->_getClientType();
-            return $type;
+            if (!isset($this->_clientType)) {
+                $this->_clientType = $this->_getClientType();
+            }
+            return $this->_clientType;
         case self::VERSION:
             if (isset($this->_properties['properties'][self::VERSION])) {
                 return $this->_properties['properties'][self::VERSION];
@@ -173,6 +182,9 @@ public function __set($property, $value)
             $properties[$property] = $value;
             $this->setDeviceProperties($properties);
             break;
+        case 'clientType':
+            $this->_clientType = $value;
+            break;
         default:
             if (!isset($this->_properties[$property]) || $value != $this->_properties[$property]) {
                 $this->_dirty[$property] = true;