Merge pull request #517 in ZP/z-push from...

Merge pull request #517 in ZP/z-push from bugfix/ZP-1198-hierarchy-cache-should-strip-data to develop

* commit '19cc91c5':
  ZP-1198 Data stripping needs to be done after all states are loaded.

src/lib/utils/zpushadmin.php

@@ -78,7 +78,6 @@ class ZPushAdmin {
         try {
             $device = new ASDevice($devid, ASDevice::UNDEFINED, $user, ASDevice::UNDEFINED);
             $device->SetData(ZPush::GetStateMachine()->GetState($devid, IStateMachine::DEVICEDATA), false);
-            $device->StripData();
 
             try {
                 // we need a StateManager for this operation
@@ -128,6 +127,7 @@ class ZPushAdmin {
                     }
                 }
             }
+            $device->StripData();
             return $device;
         }
         catch (StateNotFoundException $e) {