Merge branch 'develop' into 'Support/2.6.X'

develop into Support/2.6.X

See merge request !427

src/bundle/organization/Controller/organization.php

@@ -276,12 +276,6 @@ class organization
         foreach ($organizationList as $organization) {
             $parentOrgId = (string)$organization->parentOrgId;
 
-            if ($user->ownerOrgId && $organization->ownerOrgId != $user->ownerOrgId) {
-                if (empty($parentOrgId) && $organization->orgId != $user->ownerOrgId) {
-                    continue;
-                }
-            }
-
             if (empty($parentOrgId) && $owner) {
                 $tree[] = $organization;
                 continue;
@@ -292,6 +286,12 @@ class organization
                 continue;
             }
 
+            if ($user->ownerOrgId && $organization->ownerOrgId != $user->ownerOrgId) {
+                if (empty($parentOrgId) && $organization->orgId != $user->ownerOrgId) {
+                    continue;
+                }
+            }
+
             if (!isset($organizationByParent[$parentOrgId])) {
                 $organizationByParent[$parentOrgId] = array();
             }

src/bundle/recordsManagement/Controller/log.php

@@ -468,14 +468,17 @@ class log implements archiveDescriptionInterface
         return $path;
     }
 
-    public function contents ($type, $archiveId, $resourceId) {
+    public function contents($type, $archiveId, $resourceId)
+    {
         $archiveController = \laabs::newController('recordsManagement/archive');
 
         $res = $archiveController->consultation($archiveId, $resourceId);
 
+        $stream = (stream_get_contents($res->attachment->data));
+
         $journal = $type . PHP_EOL;
         $journal .= $archiveId . ',' . $resourceId . PHP_EOL;
-        $journal .= base64_decode($res->attachment->data);
+        $journal .= $stream;
 
         return $journal;
     }