Merge pull request #1923 from phili67/phili67-people-controllers-bug

People controllers minor bug res
phili67 · Oct 3, 2021 · f9580e1 · f9580e1
2 parents ed60125 + 2fb13c9
commit f9580e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/EcclesiaCRM/APIControllers/PeopleFamilyController.php b/src/EcclesiaCRM/APIControllers/PeopleFamilyController.php
@@ -49,15 +49,15 @@ public function __construct(ContainerInterface $container)
     }
 
     public function photo (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {
-        $res = $this->container->get('CacheProvider')->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp());
+        $response = $this->container->get('CacheProvider')->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp());
         $photo = new Photo("Family", $args['familyId']);
-        return $res->write($photo->getPhotoBytes())->withHeader('Content-type', $photo->getPhotoContentType());
+        return $response->write($photo->getPhotoBytes())->withHeader('Content-type', $photo->getPhotoContentType());
     }
 
     public function thumbnail (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {
-        $res = $this->container->get('CacheProvider')->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp());
+        $response = $this->container->get('CacheProvider')->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp());
         $photo = new Photo("Family", $args['familyId']);
-        return $res->write($photo->getThumbnailBytes())->withHeader('Content-type', $photo->getThumbnailContentType());
+        return $response->write($photo->getThumbnailBytes())->withHeader('Content-type', $photo->getThumbnailContentType());
     }
 
     public function postfamilyproperties (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {

diff --git a/src/EcclesiaCRM/APIControllers/PeoplePersonController.php b/src/EcclesiaCRM/APIControllers/PeoplePersonController.php
@@ -63,15 +63,15 @@ private function generateRandomString($length = 15)
     }
 
     public function photo (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {
-        $res=$this->container->get('CacheProvider')->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp());
+        $response=$this->container->get('CacheProvider')->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp());
         $photo = new Photo("Person",$args['personId']);
-        return $res->write($photo->getPhotoBytes())->withHeader('Content-type', $photo->getPhotoContentType());
+        return $response->write($photo->getPhotoBytes())->withHeader('Content-type', $photo->getPhotoContentType());
     }
 
     public function thumbnail (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {
-        $res=$this->container->get('CacheProvider')->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp());
+        $response=$this->container->get('CacheProvider')->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp());
         $photo = new Photo("Person",$args['personId']);
-        return $res->write($photo->getThumbnailBytes())->withHeader('Content-type', $photo->getThumbnailContentType());
+        return $response->write($photo->getThumbnailBytes())->withHeader('Content-type', $photo->getThumbnailContentType());
     }
 
     public function searchPerson (ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {